fixed .gitignore for .DS_Store
Merge branch 'master' of https://github.com/Thirdship/ColdBoot.git