trying to pull from origin
Merge pull request #4 from emfb760/master

merging to master
heart sprites, extra obstacles
merging martialman202-master
corrected some merge conflicts.
dummy commit
fixed some major merge conflicts
updated obstacles 2 & 3 prefabs
fixed bug that allowed jumping while moving to another tree
added hitbox in front of Obstacle2 prefab so it cannot be jumped over
fixed bug in TreeTrunkSpawner script that allowed obstacles to spawn on top of each other
updated all Obstacle prefabs
Stops game after 3 collisions. Still need to transition to lose screen.
Updated game over. Minus life points not working properly. Dies too quickly
Merge pull request #7 from connienguyen/master

Updated game over. Minus life points not working properly. Dies too q…
obstacles can't spawn unless monkey is on tree; fixed bug that allowed unclimbable obstacles to hit twice
Updated skybox.
Solved conflicts.
Merge pull request #8 from connienguyen/master

merging to master
added win condition