committing to pull newest update
Merge branch 'master' of https://github.com/shawnhanna/cs1635-shopping-app

Conflicts:
	.DS_Store