fixed subl issues
local changes
Merge branch 'master' of https://github.com/tboeckmann/tripping-bear

Conflicts:
	README.md
New message