cleaning up
Merge branch 'master' of github.com:driftyco/front-page

Conflicts:
	www/js/update.js