Vendor changes
DS Store
Merge branch 'master' of github.com:ashag/far_mar_finder

Conflicts:
	.DS_Store
	lib/vendor.rb