Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	__pycache__/data.cpython-34.pyc
	__pycache__/debugger.cpython-34.pyc
	__pycache__/main.cpython-34.pyc
	__pycache__/updater.cpython-34.pyc

Revert "GUI vol 4"

This reverts commit
7ec2b3809f165b184f04d54c4d59c264ef8c8e84.

Revert "GUI versioon 5"

This
reverts commit
f6cc346b5b8f0f344b0529590fad2f421f78e92e.

GUI versioon
5

ei hüppa enam.