Merge pull request #35 from depstein/ubi14

Added UbiComp Workshop Paper
Clarify upstream branch convention
Update current students
Merge pull request #37 from jayfo/GitHub

Resolves #23.

Decided this is not the time and place for Git workflows.
Merge pull request #38 from jayfo/students

Update current students
Clean and comment tests
Merge pull request #40 from jayfo/tests

Clean and comment tests
Added UIST 2014 Prefab Paper