Was gonna add picking up items, but found something I need to figure out first. So I just fixed the "half-way on top of a tree" glitch in the map instead.
Merge branch 'ryland' into micah

Conflicts:
	maps/test-2.tmx
Improved collision
Added a triangle.
Merge branch 'micah' into ryland
Almost picked up.
Ha, I picked up a triangle!
Added new player sprite
Animated player sprite with bloody arm
Merge branch 'ryland' into micah
Fixed the undefined player