Merge branch 'master' of https://github.com/x401om/diploma

Conflicts:
	Core_xcode/Core_xcode/main.c