Small fix
Merge branch 'master' of https://github.com/PimV/Bermuda-TheGame into drawableEntity

Conflicts:
	Bermuda/Bermuda/DrawableEntity.cpp
Merge pull request #12 from PimV/drawableEntity

Small fix