Added .sass-cache, .tmp and .DS_Store to .gitignore
Merge branch 'master' of https://github.com/udacity/CS256-Conference-App