Rails new
Merge branch 'master' of github.com:dmatheron/amsrb_rails

Conflicts:
	.gitignore