Merge branch 'master' of github.com:enlien/TreeSize

Conflicts:
	.gitignore