Getting really excited about sugar
Merge branch 'master' of github.com:qpan/shoppinglist

Conflicts:
	indext.html