remove extraneous emacs backup file
Merge branch 'master' of https://github.com/gwillad/syllabest
Merge branches 'master' and 'chris'
Merge branch 'master' of https://github.com/gwillad/syllabest
Added Syllabus index and new views
Merge branch 'paul'
Added syllabus show
development log
merging branches
development log
tmp
Merge branches 'chris' and 'master' into chris