Bug

Conflicts:
	GitSample/src/Master.java