Updates included
Merge pull request #61 from CMPUT301F13T05/serial

Updates included