Syncing up
Merge remote-tracking branch 'origin/Spencer' into Spencer

Conflicts:
	css/main.css