PH done
PH clean
disable trigger does not go false on controller
Merge branch 'master' of https://github.com/robbriggs/orangepotato
Merge branch 'master' of github.com:robbriggs/orangepotato

Conflicts:
	static/index.html
	static/js/present.js
Merge branch 'master' of github.com:robbriggs/orangepotato
Merge branch 'rob' of https://github.com/robbriggs/orangepotato into audio-sync
Reindented controller
Moved JS to page specific