rails new maps
bundle install
Merge branch 'master' of github.com:PullRequestFive/maps

Conflicts:
	.gitignore