adding network
Merge branch 'master' of https://github.com/densitydesign/ccfs14
network
Merge branch 'master' of https://github.com/densitydesign/ccfs14

Conflicts:
	client/index.html
	client/js/directives.js