-
-
Merge branch 'master' of https://github.com/Belltron/431DegreePlanner

Conflicts:
	DegreePlanner/DegreePlanner/Course.cs
	DegreePlanner/DegreePlanner/sqlQuery.cs
post merge