vm
Merge branch 'master' of https://github.com/paxtontech/lang

Conflicts:
	fork.js