sql
Merge branch 'sql'
building a login bar
Merge branch 'LOGIN'
kl
same
fbfd
fixing includes
fixing top.

Can't test if anything works until you put back the form stuff in the
registration page
Found my old code in a branch! register still not done
same
Merge branch 'Register'
Merge branch 'master' of https://github.com/khearn/assignment10

Conflicts:
	register.php
	top.php
ds
fff