Added trees (two sizes) and moved hero back down
Merge branch 'master' of https://github.com/justindeguzman/pennapps-2014-fall