Powerup timer fixed
powerup bugfix
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/Systems/PlayerSystem.cpp