updated end result project
Merge branch 'master' of https://github.com/rhinocoders/website