Check in just to get Neal's changes
Merge branch 'master' of https://github.com/nealhamilton/mail-center-app

Conflicts:
	AdminController.py
	AdminController.pyc
	Controller.pyc
	Validation.pyc
	logIn.pyc
	mail-center-database.db