changes channel
Merge branch 'master' of https://github.com/mikesol/purcell into grametest

Conflicts:
	js/purcell_websocket.js
Allows for caching of files for websocket server