no message
Merge remote-tracking branch 'origin/master'

Conflicts:
	ShoppingList.html
no message
Merge branch 'master' of https://github.com/leoxy520/AutismAppJam-Spring2014

Conflicts:
	ShoppingList.html
	checkOut.html