New cat
Merge branch 'master' of github.com:UWNetworksLab/instacdn

Conflicts:
	client/index.html