Merge pull request #12 from badnack/development

Development
Merge pull request #13 from badnack/development

Development
Merge pull request #14 from badnack/development

Development
Update README.md
changed gemfile to EC2
Merge branch 'master' into development
Merge remote-tracking branch 'upstream/development' into development