fix stupid bug
Merge branch 'master' of https://github.com/maxogden/voxel-engine

Conflicts:
	index.js
Merge branch 'master' into custom_controls