>> adds a login modal
Added background-color to homepage
Merge branch 'development' into login_modal

Conflicts:
	web/app/assets/stylesheets/application.css
	web/app/views/layouts/application.html.erb
Merge branch 'login_modal' into development