Change stuff and squats
Changes
Merge branch 'master' of https://github.com/KosrenDQ/MakeYouFit

Conflicts:
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/model/Configuration.java