Adding really complex tests
Updates
Merge branch 'master' of ssh://github.com/feiranwang/pa1
Merge branch 'master' of ssh://github.com/feiranwang/pa1
First stab at writeup