Delete untitled.sublime-project
init
Merge branch 'master' of github.com:sugarshin/cubick.js

Conflicts:
	untitled.sublime-project