added basic setup for rspec
Merge branch 'master' of https://github.com/dancingshell/MixnMatch

Conflicts:
	Gemfile.lock
Merge branch 'KyleR'
added more filtering for distance from