Add escape markup javascript function
Fix XSS injection in student.js
Fix merge conflict with fucking windows line endings