initial commit
Merge branch 'master' of github.com:fedemarco/ror_depot

Conflicts:
	.gitignore