Adding file to doc dir
Merge branch 'master' of https://github.com/gramirezualberta/Team04Project

Conflicts:
	TestFile.txt