deleting test file
Merge branch 'master' of https://github.com/meruse/CPSC381SP13

Conflicts:
	MyTest