updated git ignore
Merge branch 'Gui'