Temp add
Revert "Login Finished"

This reverts commit 5f5a1f99439d33dbdd83cd24776e906df38cf11f.
Merge remote-tracking branch 'origin/master'

Conflicts:
	nusadventures/urls.py
	nusadventures/views.py