smoother navigation
gtfo mock mode
Merge branch 'master' of github.com:dsharps/pennapps2013f
fix race conditions and click listener stuff
Merge branch 'master' of github.com:dsharps/pennapps2013f
Merge branch 'master' of github.com:dsharps/pennapps2013f

Conflicts:
	public/stylesheets/styles.css
	public/stylesheets/styles.scss
style merge