Merge branch 'master' of https://github.com/IntroHCI/website
Merge branch 'master' of https://github.com/mbernst/website
Merge branch 'master' of https://github.com/mbernst/website
Merge branch 'master' of https://github.com/mbernst/website
Merge branch 'master' of https://github.com/mbernst/website
Merge branch 'master' of https://github.com/mbernst/website
Merge branch 'master' of https://github.com/mbernst/website
updated logistics page so web only prototypes
bumped min-width for table cells to 150px
adding examples for assignment 3
updated lab3 materials to beta slides
Updated Lab 3
Merge branch 'master' of https://github.com/IntroHCI/website
Resolved Conflicts with lab3

Added .gitignore for common OS-generated files.
adding git ignore
merge stuff gitignore fix
Merge branch 'master' of https://github.com/IntroHCI/website