Fixed draw of fixed object
Merge branch 'master' of github.com:jreijrink/2IV15_SICG

Conflicts:
	Fluid Simulation/FluidsProject.v11.suo
	Fluid Simulation/FluidsProject/Game.cs
Removed project file from repository, always causing conflicts
feef
Merge branch 'master' of github.com:jreijrink/2IV15_SICG

Conflicts:
	Fluid Simulation/FluidsProject.v11.suo
	Fluid Simulation/FluidsProject/Game.cs
Merge branch 'master' of github.com:jreijrink/2IV15_SICG
Start of RigidBody