rails initial
Merge branch 'master' of github.com:SimonWoolf/yelp-clone

Conflicts:
	.gitignore