Update TestFile.txt
Merge branch 'patch-1' of https://github.com/mpietrasik/Team7-301Project into mpietrasik-patch-1

Conflicts:
	TestFile.txt
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project
I want the master branch??
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project
fixed some of the errors. All remaining errors are due to class name changes...
Also adding this stuff