changed folder name; some changes
again
Merge branch 'master' of https://github.com/leitnerf/truncus

Conflicts:
	.gitignore