Merge branch 'master' of https://github.com/klinvill/SCU-First-Year-Course-Plan

Merged with master
Merge branch 'master' of https://github.com/klinvill/SCU-First-Year-Course-Plan

Merged with master
Merge branch 'master' of https://github.com/klinvill/SCU-First-Year-Course-Plan

Merged with master
Merge branch 'master' of https://github.com/klinvill/SCU-First-Year-Course-Plan

Merged with master