drawing button text
Merge branch 'master' of github.com:usrshare/twtclt

Conflicts:
	src/ui.c