improved gitignore
Merge branch 'gui'
gui added to master