modified:   login.php
Merge branch 'master' of https://github.com/michaelkrauty/MPCP

Conflicts:
	login.php
Merge branch 'master' of https://github.com/michaelkrauty/MPCP

Conflicts:
	login.php

	modified:   login.php