div
class
Merge branch 'master' of https://github.com/AndreasRoed/JavaProsjektet

Conflicts:
	NorskPasientregister/build/classes/
MainWindow.class