ok merge
Merge branch 'master' of github.com:econnors/gifinator

Conflicts:
	app/views/layouts/application.html.erb
	log/development.log
gifs work