add commit after last push
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/src/com/test/NewClassCreatedInSecondary.java