LAst for tonight! C: fixat för Mac
Merge branch 'master' of https://github.com/sandraolsson/HostipalSystem

Conflicts:
	HostpitalSystem/bin/client2/start.class
	HostpitalSystem/src/client2/start.java