Merge branch 'master' of https://github.com/IVProductions/Wankah

Conflicts:
	.idea/workspace.xml