Merge remote-tracking branch 'origin/Nick'
Merge remote-tracking branch 'origin/Nick'
project settings
built a test level
Merge branch 'master' of https://github.com/s00tie/perspective_swap
update tileX; add tilecamera; update playercontroller
Level Tweaks and animation proof
Merge branch 'player_controller' of https://github.com/s00tie/perspective_swap

Conflicts:
	Assets/Scripts/TileX.meta
	Assets/Textures/sprite.png.meta
	Assets/Textures/sprite.psd.meta
character action and lock
Merge branch 'master' of https://github.com/s00tie/perspective_swap
LEVEL
Merge branch 'master' of https://github.com/s00tie/perspective_swap
Move player controller to globals
kinda fixed movement
Base animations completed. Ready to test for final. Also, the cracked wall is done. I'll send picture file next.
Merge branch 'master' of https://github.com/s00tie/perspective_swap
messing with animations
Merge branch 'master' of https://github.com/s00tie/perspective_swap
A pop-up and a cracked wall for the witch.
Merge branch 'master' of https://github.com/s00tie/perspective_swap