First commit of rails app
Merge branch 'master' of github.com:rgil90/crystal_wife

Conflicts:
	.gitignore