NU IS HIJ BETER
Merge remote-tracking branch 'origin/master'

Conflicts:
	POS/src/pos/POS.java