this is a test of updates from the psd, whoa. also matt is cooler than me.
update from ryan's stuff from psd files

Basic code update from PSD File. Also matt is cooler than me.
Merge branch 'master' of https://github.com/mattbtay/JawboneUPRace

Conflicts:
	.gitignore
	css/style.css
	index.php
	less/style.less