IDEA
Merge branch 'master' of https://github.com/PedrosPod/gamesoft

Conflicts:
	.idea/workspace.xml