Beginnings of text input
Merge branch 'master' of https://github.com/memononen/mgui

Conflicts:
	src/mgui.c