Refactored Conventions out of Course
Merge branch 'master' of github.com:kurki13/kurki13
Merge branch 'master' of github.com:kurki13/kurki13