added errors
Merge branch 'master' of github.com:econnors/gifinator
Merge branch 'master' of github.com:econnors/gifinator

Conflicts:
	app/views/users/new.html.erb