local changes
marged
changed 3
Merge branch 'master' of https://github.com/imeQ/gittest.git

Conflicts:
	src/com/git/test/Main.java