i dont remember
Merge branch 'master' of https://github.com/aarongoodermuth/himalaya

Conflicts:
	common/mysql_admin.php
--added change password functionality
--added logout functionality
--added debug directory for testing sql statements
--fixed login