qwe
asdasd
qweX
qwe Merge branch 'master' of https://github.com/jQrgen/OSoving1x

Conflicts:
	nbproject/private/private.properties
	src/Customer.java
	src/Door.java
	src/SushiBar.java