asd
Merge branch 'master' of https://github.com/HDVirtual/VRMachine

Conflicts:
	VRMachine/src/kontroleris/MainWindow.java