fixed test
fixed controller and index
Update README.md
minor fixes and test added
changed gemfile to EC2
Merge branch 'master' into development
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #17 from badnack/development

Development