first comit of usable basic gui
Merge remote branch 'origin/master'