cleaning up git
Merge branch 'master' of github.com:srinathh/gofancydirtree

Conflicts:
	demo/test
cleanup