pre-presentation changes
Merge branch 'master' of https://github.com/croes/capsel-lak.git

Conflicts:
	src/map/UniversityMap.java