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

Conflicts:
	css/main.css
Merge pull request #18 from sfraise/Spencer

Spencer