Adding DS_Store to gitignore
Merge branch 'master' of https://github.com/stephenrouse/heidi