add on_or_off
add on_or_off
add contact_number
add views.py
Merge branch 'john_assignment_1' of https://github.com/alicegugu/django-jquery-file-upload into john_assignment_1
Merge branch 'JINYINGTAN_assignment_1' of https://github.com/alicegugu/django-jquery-file-upload into JINYINGTAN_assignment_1
assignment2
assignment 2
assignment 3 -john
assignment3
assignment4
assignment4
'assignemnt5'
assignment5_edited
assignment6 track 24 hours
'assignment7'
assignment7_edit
assignment 7
assignments
Merge branch 'JINYINGTAN_assignment_1'

Conflicts:
	class_based_auth_views/views.py
	urls.py
	userprofile/models.py