init with rails stub
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore