init
Merge branch 'master' of https://github.com/hanonator/RS2-Emulator

Conflicts:
	.project