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
edited ELEN CTW
Hid MATH 9 from the waived courses message
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

Conflicts:
	ElenCourses.js
Merge branch 'master' of https://github.com/klinvill/SCU-First-Year-Course-Plan
Merge branch 'master' of https://github.com/klinvill/SCU-First-Year-Course-Plan
Merged with master
Shrank space required by AP test score section
Merge branch 'master' of https://github.com/klinvill/SCU-First-Year-Course-Plan

Conflicts:
	ElenCourses.js
Merged 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

Conflicts:
	ElenCourses.js

to merge
Merge branch 'master' of https://github.com/klinvill/SCU-First-Year-Course-Plan
fixed elen ctw