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
fixed about
Merge remote-tracking branch 'upstream/development' into development
merging changes from nilo
Working EC2 config
Working on EC2
UsersController
Deletions
resized buttons and other CSS stuff
Merge branch 'ec2' of https://github.com/scalableinternetservices/Suppr into development
User view etc
Merge pull request #31 from badnack/development

Development
merge fixed
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