minor
Merge branch 'master' of https://github.com/bsisell09/WholeKidsAdminApp

Conflicts:
	serverside/php/login/mysqlOS.php