Merge branch 'web-diff' of https://github.com/JFrei86/hwserver into web-diff
Merge branch 'web-diff' of http://github.com/JFrei86/HWserver into develop
Merge branch 'develop' of http://github.com/JFrei86/HWserver into develop
Validator should be working
Fixed merge conflicts in validator
fixed pointers in myersDiff and tokenSearch
Merge branch 'develop' of https://github.com/JFrei86/hwserver into develop
Fixed updating submitting version bugs. Assignment closed error now displays properly in an alert to the user.  Added upload to create user_assignment_settings.json if it doesn't already exist
Merge branch 'develop' of github.com:JFrei86/HWserver into develop
Merge branch 'develop' of http://github.com/JFrei86/HWserver into develop
Merge branch 'develop' of http://github.com/JFrei86/HWserver into develop