DICKBUTTT

First npc, hes dumb
Merge remote-tracking branch 'origin/master'

Conflicts:
	Collision/data/map.txt