working ui .. (testing)
Merge branch 'master' of github.com:freecoding/naskpass

Conflicts:
	ui.c