Add developer1
add developer2 for branch developer2
Merge branches 'master' and 'developer2'
Update Hero.java