Edited testfile.txt
Edited testfile.txt
Merge branch 'master' of https://github.com/Mrbilec/CMPUT301W14T09-GPSForm

Conflicts:
	CMPUT301W14T09/TestFile.txt