Merge pull request #32 from niode/nathan

Sync
Merge branch 'master' of https://github.com/niode/cpsc433
Main is better now

Kevin's changes part 3
Pushing some test cases: Nathan's changes: first bits
Bug fixes.