hit baddie, pickups, drop pickups on hit
Merge branch 'master' of https://github.com/Adhesion/ld30

Conflicts:
	data/level1.tmx
	src/LD30.js
added player gfx & animations. pickups & getting hit by baddie