fixed conflict
Merge remote-tracking branch 'origin/jeff' into wes

Conflicts:
	assets/css/style.css