merging
merging
Have moved GUI description to code. No longer need most up to date GTK library