rails app commit
Merge github.com:NikVolf/rr

Conflicts:
	.gitignore