added glyphicon to course_setup
Merge branch 'master' of https://github.com/timsants/CS147-Project
Merge branch 'master' of https://github.com/timsants/CS147-Project
glyphicon removed
Merge branch 'master' of https://github.com/timsants/CS147-Project
added right side nav menu to all pages