fixed some stupid shit
Merge branch 'master' of https://github.com/rbellido/Project

Conflicts:
	redesigned/units/creep.cpp
fixed creep, if this merge didnt fuck it...