Updated .gitignore to include .DS_Store
Merge branch 'master' of github.com:dpek/cs354s-teleport-man