Merge pull request #1 from CMPUT301F13T03/master

Sync
Merge remote-tracking branch 'cmput/master'
Update and rename TestFile.txt to README.md

Now it's a real readme again.
Merge pull request #3 from afontaine/master

Update and replace testfile.txt to README.md