merging
Merge branch 'master' of github.com:appiphony/Phillips

Conflicts:
	index.html
	js/stanleysJS.js