Uncentered Clock and How To Container
Merge branch 'master' of https://github.com/GarrethDottin/Ps

Conflicts:
	app/assets/stylesheets/user.css.scss
	app/views/users/index.html.erb