asdasd ting
qweqwe Merge branch 'master' of https://github.com/jQrgen/OSoving1x

Conflicts:
	src/EatingArea.java