commit before pulling bob's ajax function
started video page
bobs changes
stupid master problems
Merge branch 'master' into alex-dev
video function working
added test jade with in order answers
changed teachers.es6.js, teachers/index.jade, app/models/course.js, app/routes/courses.js
edited initroutes login
implemented test form for courses and teachers
still dealing with compiled files
put compiled on git ignore
Merge branch 'master' of https://github.com/marisajackson/study-buddy
fixed login looping bug
updated students.js to call student index