initial commit
Merge branch 'master' of https://github.com/luckyx1/NACLA_2.0 into user_login_steps
merged with master
things are sad
Merge branch 'user_login_steps' of github.com:luckyx1/NACLA_2.0 into show_course_pack
slight changes