Update README.md
Merge remote-tracking branch 'upstream/develop' into develop
first cuke is going RED on me. Not a good sign ;-)
Merge remote-tracking branch 'thomas/develop' into develop
'Create a website' feature complete.
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #7 from coloradobum/develop

Finished "Create a website" Feature, travis doesn't seem to be working