working on login

just started
Testing branching

This can be thrown out
Merge remote-tracking branch 'origin/Al'

Conflicts:
	COMP30005/COMP30005.db
	ganttly/urls.py