initial commit
Merge https://github.com/atticcas/RoR

Conflicts:
	.gitignore