Fix some bugs
Merge branch 'master' of https://github.com/JustANeter/tups

Conflicts:
	main.c