Added error page and fixed adding in for students
Fixed own merge conflict