add
remove js files
Merge branch 'master' of github.com:FrankFang/simple_node_proxy

Conflicts:
	myproxy.coffee