edit gitignore
Merge remote-tracking branch 'ScreenOut/master' into develop