Embrace the Forking Git workflow

roboticslab-uc3m/questions-and-answers#88

.travis.yml

@@ -10,11 +10,11 @@ env:
   global:
     - CACHE_DIR=~/cached-deps
     - YCM_CHECKOUT=ycm-0.11
-  matrix:
+  jobs:
     - YARP_CHECKOUT=yarp-3.3
     - YARP_CHECKOUT=yarp-3.2
 
-matrix:
+jobs:
   include:
     - if: type = cron
       compiler: gcc

CONTRIBUTING.md

@@ -7,5 +7,5 @@ Before opening a fresh issue, do a search on [the wiki](http://robots.uc3m.es/in
 * 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.
+* We follow the [Forking](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow/) Git workflow.
 

README.md

@@ -20,13 +20,13 @@ Installation instructions for installing from source can be found [here]( /doc/f
 
 #### Posting Issues
 
-1. Read [CONTRIBUTING.md](https://github.com/roboticslab-uc3m/follow-me/blob/master/CONTRIBUTING.md)
+1. Read [CONTRIBUTING.md](CONTRIBUTING.md)
 2. [Post an issue / Feature request / Specific documentation request](https://github.com/roboticslab-uc3m/follow-me/issues)
 
 #### Fork & Pull Request
 
 1. [Fork the repository](https://github.com/roboticslab-uc3m/follow-me/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
@@ -41,7 +41,7 @@ Installation instructions for installing from source can be found [here]( /doc/f
 
 ## Status
 
-[![Build Status (Linux)](https://travis-ci.com/roboticslab-uc3m/follow-me.svg?branch=develop)](https://travis-ci.com/roboticslab-uc3m/follow-me)
+[![Build Status (Linux)](https://travis-ci.com/roboticslab-uc3m/follow-me.svg?branch=master)](https://travis-ci.com/roboticslab-uc3m/follow-me)
 
 [![Coverage Status](https://coveralls.io/repos/roboticslab-uc3m/follow-me/badge.svg)](https://coveralls.io/r/roboticslab-uc3m/follow-me)