Tables added to models.py
Merged with more complete version of code
Merge remote-tracking branch 'origin/master'

Conflicts:
	MarkingSystem/.idea/workspace.xml
	MarkingSystem/Squirel/admin.py
	MarkingSystem/Squirel/models.py
	MarkingSystem/db.sqlite3
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'