Committing with a conflict
Merge branch 'master' of https://github.com/npankrat/HelloTeam.git

Conflicts:
	src/test/FirstClass.java