Update alerts
Make style changes based on code review
Fix period
Merge branch 'logout'

Conflicts:
	app/assets/stylesheets/style.css