Why did this file not update when I clicked commit?
Do I have to commit in my IDE then in my Windows client?
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestForGitHub/bin/pack/Hello.class