updated merchant_params
Merge branch 'master' of https://github.com/jophis/localvore
updated welcome styling
fixing conflict
ajax functionality on welcome index
Merge branch 'master' of https://github.com/jophis/localvore
renamed farms.js to maps.js