init my rails train
Merge branch 'master' of https://github.com/zx1986/train

Conflicts:
	.gitignore