Setting up rmagick
created the authorization to sign in with google, and fixed the bugs
Merge branch 'master' into rmagick
Working on minimagick customization
 created test for user module and for user controller, 0 failed,  created test for devise, 8 failed
Added check on upload for image size/image file
Fully working minimagick/uploader/resizing sitewide
All minimagick, resizing, file checks, size checks working nicely
styled links
merged master on omniauth and fixed the conflicts
ran migration and added taggings table
Added links within photowall
Fixed links within photowall
added devise confirmable and added a letter_opener gem
Merge branch 'master' into mail

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	db/schema.rb
Edited .gitignore file
changed gitignore
Merge branch 'master' of github.com:jdeslangles/project2
Fixed test branch merging issues, minor layout changes
Implemented aws sitewide