add settings
Merge branch 'master' of https://github.com/KosrenDQ/MakeYouFit

Conflicts:
	MakeYouFit/makeYouFit/build.gradle
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/StartApp.java