Merge pull request #14 from Winston-Chan/nathan

Fixed things in Main, added placeholder toString to Node
Merge remote-tracking branch 'origin' into nathan