add DS_Store to git ignore
Merge branch 'master' of github.com:TISYE-GroupC/TermaCase
Merge branch 'master' of https://github.com/TISYE-GroupC/TermaCase