Testing the ability of git to manage change to the same source file in 2 locations.

Signed-off-by: barryeee <eichelbergerb@nicc.edu>
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gtitest.txt