merge + hero construktor takes name
Merge branch 'master' of https://github.com/iamhj/HEROES

Conflicts:
	MavenProject/mavenheroes/core/src/main/java/model/player/Hero.java