Updated .gitignore and Gemfile.lock
Merge branch 'master' of github.com:juliatan/racefinder

Conflicts:
	.gitignore
	Gemfile.lock