Merge branch 'master' of https://github.com/Talicska/PPC

Conflicts:
	.idea/misc.xml