Add project screenshots

* add carrierwave and rmagick gems
* add file field for uploads
* CSS style add projects page
Merge conflict resolution
Merge branch 'master' into carrierwave

Conflicts:
	app/assets/stylesheets/users.css.scss
Merge pull request #43 from aphuong/carrierwave

Add project screenshots
Merge conflict resolution

Merge branch 'master' into todo

Conflicts:
	app/controllers/users_controller.rb