- further experiments with browserify
Merge branch 'master' of github.com:usco/asset-manager

Conflicts:
	src/assetManager.coffee
	test-commands.txt