Created rails application
Merge branch 'master' of github.com:GrSpirit/test_site

Conflicts:
	.gitignore