Added some local copy stuff still working on it
Fix conflicts
Merge pull request #64 from CMPUT301F13T05/serial

Added some local copy stuff still working on it