Cleaner
Merge branch 'master' of github.com:UWNetworksLab/freedom

Conflicts:
	demo/chat/index.html