Initial commit
Merge https://github.com/aquanova/rails

Conflicts:
	.gitignore