just a test
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestSalaryManager/TestSalaryCaculator.java
just a test