den finalen commit 16. 12. DOKU ANFANGEN!!!!!!
Merge branch 'master' of https://github.com/STOXX50/WPF-MW

Conflicts:
	login.html
	php/login.php