Removed conflicted lines
Merge branch 'master' of https://github.com/homeretailgroup/com.argos.hackathon.teamSeven

Conflicts:
	l1.html