commit
Merge branch 'master' of https://github.com/JAWA21/ssl_group

Conflicts:
	views/loggedinView.php