Updating gitignore
Various commits
Merge branch 'master' of github.com:homeretailgroup/com.argos.hackathon.teamSix

Conflicts:
	web/index.html