latest commit 27/6/14 6.56pm
Merge remote-tracking branch 'origin/master'

Conflicts:
	products.html
latest commit 7.06pm 27/6/14