edits to add an overall assignment message, and an option to not penalize extra lines is the student output
Merge branch 'server' of https://github.com/JFrei86/HWserver into server
add support for display of TA grades
moved tokens and testResults into separate files
making last commit compile, and also split functions out of grading&modules .h files into separate .cpp files
many changes that allow for multiple compiles per submission, also changed how tokens are integrated, still not tested
homework 3 released
lab5 finished
Upload accepts all file types, no type whitelist
Merge commit 'a0819f5e542b6a3deb38fe7e9681003c07986597' into develop

* commit 'a0819f5e542b6a3deb38fe7e9681003c07986597':
  Upload accepts all file types, no type whitelist
  lab5 finished
  homework 3 released
  many changes that allow for multiple compiles per submission, also changed how tokens are integrated, still not tested
  making last commit compile, and also split functions out of grading&modules .h files into separate .cpp files
  moved tokens and testResults into separate files
  add support for display of TA grades
  edits to add an overall assignment message, and an option to not penalize extra lines is the student output

Conflicts:
	Sample_Files/nav_container.php
	Sample_Files/sampleAssignments/Default/Makefile
	Sample_Files/sampleAssignments/default_hw1_text_justification/Makefile
	public/controller/data_functions.php
	public/controller/upload.php
	public/view/csciXXXX_container.php
	public/view/nav_container.php