i have a teammate
Signed-off-by: Training User <training@java-bootcamp.(none)>
Merge branch 'master' of https://github.com/gpmelendez/sampleRepository

Conflicts:
	SomeFile.txt

Signed-off-by: Training User <training@java-bootcamp.(none)>