Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos

Conflicts:
	.idea/workspace.xml