merge
Merge branch 'fridayEdition' of github.com:appiphony/Phillips into fridayEdition

Conflicts:
	indexv2.html