Collisions player - map
Credits sequence
Merge branch 'master' of https://github.com/fabiopicchi/spjam-catavento-2014

Conflicts:
	Source/Tilemap.hx
Updated git ignore