lokale Aenderung
ignore *.swp
Merge remote-tracking branch 'origin/master'