Removed merge conflict
resolved merge conflict
added validation logic for enforcing proctortrack escalation email
added dependencies for email validator and testing, added code and tests for requiring valid email
added validation for editing proctoring provider field
added validation for editing proctoring provider field
Add error handling code to the Exam settings page. Also include spinners for loading (#10)
updated help text
updated comment
added unit tests
updates for requested changes
removed unnecessary line
trying to see if tests will rerun
testing for travis build
adding another test
adding another test for travis
uncommented last test
updated tests
trying to fix test
removed tests
This change would fix tests so they are actually doing the testing job (#11)
Update the error messages based on copy provided by Deen (#13)
