time to merge
Merge branch 'master' of https://github.com/ProjectGroep1/Joetz-Windows

Conflicts:
	ProjectenIII/JoetzPhoneApp/App.xaml