DUCKING FUCKING WORKS

Yeah that rhymed.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	dragonfly/Hero.h
	dragonfly/Makefile
	dragonfly/game
	dragonfly/game.cpp