Where did I leave off?
Merge branch 'signin-page' of sopo-kiosk into signin-page

Conflicts:
	kiosk/kiosk/__init__.py
	kiosk/kiosk/views.py
Forgot to add this file