Initial commit
Merge branch 'master' of github.com:kbaijnat/omrails

Conflicts:
	.gitignore