PH done
PH clean
Merge branch 'master' of github.com:robbriggs/orangepotato

Conflicts:
	static/index.html
	static/js/present.js
Merge branch 'master' of github.com:robbriggs/orangepotato