Changed for Presentation
Merge branch 'firstsite' of https://github.com/fanjian5i5i/mustached-octo-computing-machine into firstsite

Conflicts:
	js/functions.js