Fixed gitignore hopefully no more workspace BS
Merge remote-tracking branch 'origin/master'