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
fixed check interval
pushing latest changes
production.rb version changed and caching changed
changed production.rb
changed index.html
fixed broken master
fixed broken master
merge conflics fixed
fixed png for index.html
fixed png for pencilicon
fixed png for pencilicon
attempt to fix flipclock issue
attempt to fix javascript include tag issue
attempt to fix sound, font, and multiple js files of progressbar
attempt to fix font and multiple js
changed image and javascript helpers
fonts are in place