Work on timers
Merge branch 'master' of https://github.com/dsharps/pennapps2013f

Conflicts:
	public/javascripts/scripts.js
	public/stylesheets/styles.css
Merging styles.css