Added figaro for application.yaml stuff
I am committing a merge.

Merge branch 'master' of https://github.com/bytheway875/HashTat

Conflicts:
	app/controllers/tattoos_controller.rb
Update README.textile
Merge pull request #7 from bytheway875/master

Added rmagick for picture resizing and aws s3 photo storage