Virtual inheritance
Merge branch 'Develop' of https://github.com/PimV/Bermuda-TheGame into Hotfix

Conflicts:
	Bermuda/Bermuda/Bermuda.vcxproj.filters
	Bermuda/Bermuda/Player.cpp
More fixes after pull
Removed unneeded stuff
Merge pull request #31 from PimV/Hotfix

Hotfix