Test
Merge branch 'master' of https://github.com/novartisTeamOvertime/Glivec-project

Conflicts:
	index.html
Merge branch 'master' of https://github.com/novartisTeamOvertime/Glivec-project