Configure email for production with Mandrill.
Merge pull request #21 from LaunchAcademy/add_mailer

Configure email for production with Mandrill.
user can upload profile photo, view user profile page
user has a thumbnail version of their profile photo
added validation on decription - 255
cleaned up code
test added
Updated emails and sent-from address
Validations on descriptions and titles
Merge pull request #22 from LaunchAcademy/add_validations

Add validations
user can upload a cat or submit a url
put page values in controller, fixed show page slightly, fixed tests/factories
Merge pull request #20 from LaunchAcademy/aw-pagination

Added Kaminari for pagination of cats and reviews.
fixes made per comments
Merge branch 'master' of https://github.com/LaunchAcademy/caturday_funtime into uploads
test uploads are sent to public directory
Merge branch 'uploads' into upload_cat

Conflicts:
	app/models/cat.rb
	app/views/cats/show.html.erb
	config/initializers/carrierwave.rb
todo tasks updated
Clean up some tests.
Merge branch 'uploads' into upload_cat