Merge branch 'master' of github.com:ghemingway/cad.js

Conflicts:
	package.json
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'github/master' have diverged,
# and have 3 and 11 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   gulpfile.js
#	modified:   package.json
#	modified:   public/index.html
#	modified:   public/javascript/build.js
#	modified:   public/javascript/cad.js
#	modified:   public/javascript/libs/visualize.js
#	modified:   public/javascript/main.js
#	modified:   public/stylesheets/stepview.css
#	modified:   public/viewer.html
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   public/javascript/shaders/VelvetyShader.js
#
Merge branch 'master' of github.com:ghemingway/cad.js
Fix build