admin changes
Merge branch 'master' of https://github.com/nealhamilton/mail-center-app

Conflicts:
	Controller.pyc
	logIn.pyc
	mail-center-database.db