merge
merge
Merge branch 'master' of https://github.com/Frumbasjt/TactileAPI.git

Conflicts:
	TactileAPI/src/nl/utwente/cs/caes/tactile/PhysicsController.java
	Uitproberen/src/application/Uitproberen.java