Merge branch 'master' into carmine
added locu module

added “locu” module in  node_modules
update loci.js
Update parse.js
pasre.js
parse.js
Merge branch 'carmine'

Conflicts:
	grubQuest-node/parse.js
Merge branch 'master' of https://github.com/ctrovato/grubQuest