Committing to local
Merge branch 'master' of https://github.com/jamonroe/Milestone2PartA.git

Conflicts:
	.classpath
Added in primary keys (Course ID, Title, University, and Instructor)