add .gitignore; remove .DS_Store from repo
Merge branch 'master' of github.com:furtherLee/hackthon