Update 10:33 Updated CSS
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/css/style.css
	app/views/sessions/create.blade.php