Merge pull request #6 from gregrgay/master
authorGreg Gay <ggay@ocad.ca>
Tue, 4 Oct 2011 15:22:10 +0000 (08:22 -0700)
committerGreg Gay <ggay@ocad.ca>
Tue, 4 Oct 2011 15:22:10 +0000 (08:22 -0700)
Restructuring


Trivial merge