initial
Merge branch 'master' of https://github.com/wmiel/BD2_ror

Conflicts:
	.gitignore