Pagina de Prezentare
Merge branch 'master' of https://github.com/niculiviu/TaskHeroes

Conflicts:
	static/index.html