comment and other stuff我爱加拿大
Merge branch 'master' of https://github.com/Macmee/bestMapAppNA

Conflicts:

node_modules/grunt-cli/node_modules/findup-sync/node_modules/glob/node_m
odules/graceful-fs/package.json

node_modules/grunt-cli/node_modules/findup-sync/node_modules/glob/node_m
odules/inherits/package.json

node_modules/grunt-cli/node_modules/findup-sync/node_modules/glob/node_m
odules/minimatch/node_modules/lru-cache/package.json

node_modules/grunt-cli/node_modules/findup-sync/node_modules/glob/node_m
odules/minimatch/node_modules/sigmund/package.json

node_modules/grunt-cli/node_modules/findup-sync/node_modules/glob/node_m
odules/minimatch/package.json

node_modules/grunt-cli/node_modules/findup-sync/node_modules/glob/packag
e.json

node_modules/grunt-cli/node_modules/findup-sync/node_modules/lodash/READ
ME.md

node_modules/grunt-cli/node_modules/findup-sync/node_modules/lodash/pack
age.json
	node_modules/grunt-cli/node_modules/findup-sync/package.json

node_modules/grunt-cli/node_modules/nopt/node_modules/abbrev/package.jso
n
	node_modules/grunt-cli/node_modules/nopt/package.json
	node_modules/grunt-cli/node_modules/resolve/package.json