Merge pull request #8 from gtallen1187/develop

Develop
Merge pull request #9 from gtallen1187/develop

fixing syntax error
Merge pull request #10 from gtallen1187/develop

Develop
fixing up gemfile and gitignore
Merge pull request #11 from gtallen1187/master

merging into production