giving work to fleming
Merge branch 'fridayEdition' of github.com:appiphony/Phillips into fridayEdition

Conflicts:
	css/phillips-template.css