untrack build folder
banish .DS_Store
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site

Conflicts:
	.DS_Store
	src/.DS_Store