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

Conflicts:
	index.html
added developer notes
Merge remote-tracking branch 'refs/remotes/origin/dev.samitha.fernando'
Merge branch 'refs/heads/sprint-1'