Made DataObject setmethod private
Merge branch 'master' of https://github.com/vk255/CourseScheduler

Conflicts:
	Controller/DataObject.java