First commit
Merge github.com:dima11221122/ror

Conflicts:
	.gitignore