welcome controller & route
added geocoder gem & landing.js
added testing gems
geocoder working
merchant search
merchant styling
fixed merge conflicts