Resolve merge
Merge branch 'master' of https://github.com/danielous16/tribli

Conflicts:
	.idea/workspace.xml