added to string method
Merge branch 'master' of https://github.com/karlaugsten/CPSC433

Conflicts:
	src/examSchedule/Environment.java