thomAas
Merge branch 'master' of github.com:fraek/Team5

Conflicts:
	Veilingsite/src/nl/team5/app/Beheerder.java