Slight change to .gitignore
Removed artificats of screwed up .gitignore
Merge branch 'fixed-gitignore'
Locked
Merge branch 'first-attempt-master' into test-t0