Ignore temp files for git
Merge branch 'Klopsch'