Getting really excited about sugar
Merge branch 'master' of github.com:Ggpsv/shopping

Conflicts:
	index.html