crypt v2
Merge branch 'master' of https://github.com/WillyB/AGLSeniorDesign

Conflicts:
	LogIn.php