added master branch label
Merge branch 'refs/heads/master' into sprint-1

Conflicts:
	index.html