last commit before experimental pull
checnged students/index
Merge branch 'master' into alex-dev
created jade and css files
small additions to index and login
started course show function and pages
Merge branch 'marisadev'
alex changes on less added buttons updated homeindex teacherindex coursesnew
up to date
commit before pulling bob's ajax function
added main.js global ajax, login splash sees teacher or student
started video page
bobs changes
stupid master problems
Merge branch 'master' into alex-dev
video function working
added test jade with in order answers
login-logout functionality completed, student-teacher pages also secured based on user type
changed teachers.es6.js, teachers/index.jade, app/models/course.js, app/routes/courses.js
edited initroutes login