stuff
Merge branch 'master' of https://github.com/dmikeasem/giffy

Conflicts:
	app/views/layouts/_header.html.erb
	config/routes.rb