Updated GitIgnore
Merge branch 'alex2' into odkken2