Meeting 2 assignment
Merge branch 'master' of github.com:CUTheory/theory3