Merge pull request #19 from badnack/master

Time to move on
Merge pull request #27 from badnack/master

Time to bring on master
bundle gems
initial amazon commit
Merge branch 'dev'

merging dev
Working EC2 config
Working on EC2
resized buttons and other CSS stuff
Merge branch 'ec2' of https://github.com/scalableinternetservices/Suppr into development
Merge pull request #32 from henrievk/development

User view - show
Merge remote-tracking branch 'upstream/development' into development
Merge branch 'development' of https://github.com/scalableinternetservices/Suppr into development
Merge pull request #33 from julierwr/development

Resized buttons and other CSS stuff
Fixed dev database.yml
Merge branch 'development' of https://github.com/scalableinternetservices/Suppr into development
fixed test
added check
fixed painful bug
Merge pull request #34 from badnack/development

Development
cancel button is not showed if not host