First
Merge branch 'master' of https://github.com/asm2500/gtk_cpp

Conflicts:
	gtk_1/main.c