Merge branch 'signup' of github.com:willhall88/Angry-Kitty into bootstrap

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/devise/registrations/new.html.erb