Merge pull request #34 from PimV/Develop

Develop
Merge branch 'master' of https://github.com/PimV/Bermuda-TheGame
Bars done?
names fixed
More Bars
Merge branch 'Develop' of https://github.com/PimV/Bermuda-TheGame into HealthHungerThirstBars
mem leak out player
Merged + Color in DrawText
Smaller test map added
Merge pull request #88 from PimV/Map

Smaller test map added
Merge pull request #90 from PimV/Develop

Develop
2 comments van johan verwerkt
draw gerenamed (johans comment)
Merge pull request #85 from PimV/HealthHungerThirstBars

Health hunger thirst bars
Merge branch 'Develop' of https://github.com/PimV/Bermuda-TheGame into Hotfix

Conflicts:
	Bermuda/Bermuda/Player.cpp