push this
Merge branch 'master' of https://github.com/dlee0113/git_test

Conflicts:
	eclipse_egit_test/src/Test.java