Merge pull request #5 from gregparsons/development

Added basic home page/route #2
changed gem file
Merge pull request #7 from henrievk/development

Development
Merge branch 'master' into development

added photo
GP: added event controller
added event controller
Merge pull request #8 from scalableinternetservices/development

Development