renamed ini.c to ini.cpp to be rid of clang warning
Merge branch 'master' of https://github.com/stefanhendriks/Dune-II---The-Maker

Conflicts:
	makefile.osx
changed house names to enum
Unit is now aware of the House it belong to
fixed makefile
Player class introduced.
added Game::playerHasUnits()
Merge branch 'gameover' of github.com:Kojirion/Dune-II---The-Maker into Kojirion-gameover

Conflicts:
	game.cpp
	unit.cpp
	unit.h