init project
Merge branch 'master' of https://github.com/7Silvan/test_rails

Conflicts:
	.gitignore