Merge pull request #8 from scalableinternetservices/development

Development
fixed test
fixed controller and index
Update README.md
Merge pull request #15 from badnack/master

Update README.md
minor fixes and test added
changed gemfile to EC2
Merge branch 'master' into development
modified seed to not expire during app development
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #17 from badnack/development

Development
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into development
[#82137790] added unclickable button for not signed users
Merge pull request #18 from badnack/development

Development
Added search bar, moved some thing out of permanent header
Merge remote-tracking branch 'upstream/development' into development

did som things
Design stuff, and implementation of photo-uploader from computer