Merge pull request #5 from rjynn/master

deleted temp files
Merge https://github.com/CMPUT301F14T03/lotsofcodingkitty