Commit local first.
Merge branch 'master' of https://github.com/lavigne/EgitTest.git

Conflicts:
	src/com/github/lavigne/test/Test.java