Updated .gitigore

i.a. to ignore *~-files.
Merge branch 'master' of https://github.com/jesajx/inda12-proj