initial new rails app
Merge branch 'master' of github.com:aleksbond/the_grey_girl

Conflicts:
	.gitignore