Login Commit
Merge branch 'master' of https://github.com/Babbafett/ActivityRecording

Conflicts:
	php/checkLogin.php