local commit
Merge branch 'master' of https://github.com/sagar27/shoppinglist

Conflicts:
	about.html