More styles
Merge branch 'master' of https://github.com/alexreedhill/choreboard

Conflicts:
	app/assets/stylesheets/application.css
	app/views/landing/landing.html.erb
	app/views/layouts/application.html.erb
	app/views/users/profile.html.erb