hero character added to scoreboard
Fixed broken merge.
Removed playtest from merge.
Merge branch 'master' of github.com:oc-cs170/feed-me