Fixed conflicts, added oak tree, renamed hero files
Merge branch 'master' of https://github.com/brisingrbolt/aR-P-G

Conflicts:
Fixed image name conflicts