Git ignore
Merge branch 'master' of https://github.com/romapsih/Master

Conflicts:
	.idea/workspace.xml