Syncing shit up...I hate you git
Merge branch 'master' of https://github.com/rbrt/gamejam2014
Merge branch 'master' of https://github.com/rbrt/gamejam2014
Added in item perception mode once you meet the green block
Added some level geometry and one-way platform collisions
resolved merge conflict to allow for successful pul lrequest
Fixed memory leak resulting fro mtransitions
transition effect tied into main controller code. rough trace implementation
Merge branch 'transitions' of https://github.com/rbrt/gamejam2014 into transitions

Conflicts:
	gamejam2014/Assets/scripts/PlayerController.cs