Only one orange
Merge branch 'master' of https://github.com/mtlee114/shoppinglist

Conflicts:
	index.html