update gitignore
Merge branch 'master' of /home/enco/sites/smd with conflicts.
Merge remote-tracking branch 'origin/master'