local
Merge branch 'master' of https://github.com/blesh/VolcanoJS

Conflicts:
	.idea/workspace.xml
clean out .idea folder