Default template with 'Diplom' replaced with 'Studien'
Merge branch 'master' of https://github.com/katja/Studienarbeit
Excluded some other files (gitignore)