LOL
Merge branch 'master' of https://github.com/homeretailgroup/com.argos.hackathon.teamSix

Conflicts:
	web/app/views/home.html