fix derped HEAD
Merge branch 'master' of https://github.com/Molitov/collab-edit

Conflicts:
	static/js/script.js
Merge branch 'master' of https://github.com/Molitov/collab-edit