Initial rails commit
Merge branch 'master' of https://github.com/gentiana/lodowka

Conflicts:
	.gitignore