master file change
Merge branch 'master' of github.com:econnors/gifinator

Conflicts:
	app/views/users/new.html.erb
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655