Merge branch 'master' into animate-wheels
added new jeep + wheel objects
Merge branch 'animate-wheels' into add-jeep
added jeep object (dummy object for now)
Replaced object files, they seemd to differ
Changed object files
Revert "Changed object files"

This reverts commit fe1a2c71f1afaf52854d8d51e8e695fff43fc88f.
Revert "Replaced object files, they seemd to differ"

This reverts commit 262b5743d15ecc2e3af6e209fc8916bbefe33757.
made jeep look more like a jeep
Merge branch 'add-jeep' of https://github.com/festen/game-project into add-jeep
Merge branch 'master' into add-jeep

Conflicts:
	Game/Game/GameEngine.cpp
	Game/Game/Jeep.cpp
fixed rotation direction of wheels
Merge branch 'master' into add-jeep

Conflicts:
	Game/Game/Game.vcxproj.filters
	Game/Game/GameEngine.cpp
	Game/Game/Jeep.cpp
Nothing fixed, changed to test

In jeep.cpp, the glBufferData only loaded the first element of
this->out_vertices. According to me, this is strange, since it needs to
bind the buffer to all the vertices. However, the results looks really
weird and a big strange object is created.
Merge pull request #26 from festen/add-jeep

Problemen van gister zijn opgelost, Dus add-jeep kan gemerged worden. Nu nog de modellen inladen