Add caption text area and center new image form
Create new image form - dynamically adding categories not working yet
Merge branch 'master' into katryn

Conflicts:
	app/assets/stylesheets/foundation_and_overrides.scss
	config/routes.rb
Add "add tag" to a separate div section so it doesn't jump to the top of the form. Add slow sexy fade in for a new tag field.
Add serializer gem and create serializer for image and category (I don't know which one I need!)
Fix resizing on add new image page
Add error message to preven user from submitting image without image attached
Putting aside this branch for now...
change
Final branch resolution
Merge branch 'katryn'

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/assets/stylesheets/foundation_and_overrides.scss
	app/controllers/images_controller.rb
	app/views/images/new.html.erb
	app/views/images/show.html.erb
	config/routes.rb