Merge pull request #1 from TeamViperFish/develop

Made Setup Instructions MUCH BETTER
Merge pull request #2 from j3rn/develop

Small Setup changes
Merge pull request #3 from TeamViperFish/develop

Small changes
Merge pull request #4 from j3rn/develop

Updated gitignore
Merge pull request #5 from TeamViperFish/develop

Updated gitignore
Merge pull request #6 from j3rn/develop

Gitignore Changes and Rails
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #7 from j3rn/develop

Added Gems
Merge remote-tracking branch 'upstream/develop' into develop
Add Compass mixins for Sass in the Gemfile
Merge pull request #8 from Icarurs/develop

Add Compass to the Gemfile
Merge pull request #9 from j3rn/develop

Added therubyracer
added paperclip and acts_as_commentable
Merge remote-tracking branch 'upstream/develop' into develop

fuck
Merge pull request #10 from MarwanNakhaleh/master

added paperclip and acts_as_commentable
Move Postgres to Production group
Merge pull request #11 from Icarurs/develop

Move Postgres to Production group
images model
Merge pull request #12 from MarwanNakhaleh/develop

images model
Fixed Devise issues