c
Merge branch 'master' of https://github.com/awm4j/Asiph-Game

Conflicts:
	.idea/workspace.xml
Removed separated files