gui
Merge branch 'master' of https://github.com/Alonai/TralalaClient

Conflicts:
	.gitignore
gui