The point of no return, quick and dirty
Merge branch 'master' of https://github.com/KosrenDQ/MakeYouFit

Conflicts:
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/Activities/HistorySectionFragment.java
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/Activities/WorkoutSectionFragment.java
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/Root.java
	MakeYouFit/makeYouFit/src/main/java/makeyoufit/uni/ks/util/ResourceManager.java
	MakeYouFit/makeYouFit/src/main/res/layout/fragment_history_section.xml
Fuck this git
Merge branch 'master' of https://github.com/KosrenDQ/MakeYouFit