hero
Merge remote-tracking branch 'origin/master'

Conflicts:
	hero.cpp
	hero.h