Merge branch 'master' of github.com:luckyx1/NACLA_2.0 into show_course_pack
more show/edit stuff
Merge branch 'show_course_pack' of github.com:luckyx1/NACLA_2.0