first commit
Merge branch 'master' of https://github.com/lifeismotley/railsWebsite
Test
Merged with remote