ignore .DS_Store
remove DS_Store
Merge branch 'master' of https://github.com/instantiator/hack-the-police-2013