Get that sugar!
Merge branch 'master' of https://github.com/harveysanders/shoppinglist

Conflicts:
	index.html