Updated Lab 3
Merge branch 'master' of https://github.com/IntroHCI/website
Resolved Conflicts with lab3

Added .gitignore for common OS-generated files.