Embrace the Forking Git workflow

roboticslab-uc3m/questions-and-answers#88

CONTRIBUTING.md

@@ -1,10 +1,10 @@
-Have a feature request or found a bug?
-
-Before opening a fresh issue, do a search on [the wiki](http://robots.uc3m.es/index.php/TEO) and on [GitHub](https://github.com/roboticslab-uc3m/teo-main/issues?utf8=%E2%9C%93&q=is%3Aissue) and make sure it hasn't already been addressed. Here are some notes on how to detail feature requests or bug reports:
-* Explain, as detailed as possible, how to reproduce the issue or the specific behaviour for the feature.
-* Include what you expected to happen and what actually happened.
-* Please include information on what operating system and version you are working with. Also add any other relevant details.
-* Feel free to attach any other information illustrating the issue if copying and pasting text is not an option.
-
-Notes:
-* We follow the [GitFlow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/) git workflow.
+Have a feature request or found a bug?
+
+Before opening a fresh issue, do a search on [the wiki](http://robots.uc3m.es/index.php/TEO) and on [GitHub](https://github.com/roboticslab-uc3m/teo-main/issues?utf8=%E2%9C%93&q=is%3Aissue) and make sure it hasn't already been addressed. Here are some notes on how to detail feature requests or bug reports:
+* Explain, as detailed as possible, how to reproduce the issue or the specific behaviour for the feature.
+* Include what you expected to happen and what actually happened.
+* Please include information on what operating system and version you are working with. Also add any other relevant details.
+* Feel free to attach any other information illustrating the issue if copying and pasting text is not an option.
+
+Notes:
+* We follow the [Forking](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow/) Git workflow.

README.md

@@ -1,6 +1,5 @@
 [![teo-main Homepage](https://img.shields.io/badge/teo-main-orange.svg)](http://roboticslab.uc3m.es/roboticslab/robot/teo-humanoid) [![Latest Release](https://img.shields.io/github/tag/roboticslab-uc3m/teo-main.svg?label=latest%20release)](https://github.com/roboticslab-uc3m/teo-main/tags)
 ![Travis branch (master)](https://img.shields.io/travis/roboticslab-uc3m/teo-main/master.svg?label=master)
-![Travis branch (develop)](https://img.shields.io/travis/roboticslab-uc3m/teo-main/master.svg?label=develop)
 [![Issues](https://img.shields.io/github/issues/roboticslab-uc3m/teo-main.svg?label=issues)](https://github.com/roboticslab-uc3m/teo-main/issues)
 
 [TEO full-sized humanoid robot](http://roboticslab.uc3m.es/roboticslab/robot/teo-humanoid): super/meta repository.
@@ -24,7 +23,7 @@ Installation instructions for installing from source can be found [here](doc/teo
 #### Fork & Pull Request
 
 1. [Fork the repository](https://github.com/roboticslab-uc3m/teo-main/fork)
-2. Create your feature branch (`git checkout -b my-new-feature`) off the `develop` branch, following the [GitFlow git workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
+2. Create your feature branch (`git checkout -b my-new-feature`) off the `master` branch, following the [Forking Git workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow)
 3. Commit your changes
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request