Welcome to the world
Merge branch 'master' of github.com:Workman/RapidRails

Conflicts:
	.gitignore