removing sublime-workspace file
Merge branch 'master' of github.com:sdakin/todo-txt

Conflicts:
	todo-txt.sublime-workspace
ignoring non-project files