BP-17: Deleting our git test file.
Merge branch 'master' of https://github.com/dudewad/BPeterson

Conflicts:
	test.txt
BP-17: Deleting our git test file.