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

Conflicts:
	index.html
Merge branch 'master' of github.com:appiphony/Phillips

Conflicts:
	css/phillips-template.css
	index.html