whatev
work in progress, just gui
where did this go before
Merge branch 'master' into jeremy

Conflicts:
	src/results.php
removed backup files (~)
so i can merge new GUi stuffs
Merge branch 'GUI' into jeremy
Done something with Personal setting:
	bit of a profile, and a change password page:
		(no actual password changing yet, only checks empty &
		matching new passwords)
wow I did not add tracking to most things
Merge branch 'ryan' into jeremy
change password stuff works, with warning on send:
	Notice: Trying to get property of non-object in
	C:\...MockDatabase.php on line 133.

	probably some drivers, changing pw done in same way as email reset
Merge branch 'ryan' into jeremy
changed body to have div id="wrapperHeader" in login.php, getPassword.php, and pass_reset_complete.php
wrapperHeader to results.php as well
fixed some bugs
fixed bugs like crazy
merged ryan's fixes