trying to get back files
death ray
Merge branch 'master' of https://github.com/kennysong/synematic

Conflicts:
	client/main.js
	client/synematic.html
merged all changes :)