stuff i did on laptop
Merge branch 'master' of https://github.com/ProjectGroep1/Joetz-Android-V2

Conflicts:
	Joetz_Android_V2/app/src/main/java/com/example/jens/myapplication/apimanager/manager/CampManager.java