Output message changed
merge
project name changed
Merge branch 'master' of https://github.com/mivicTz/githubTestRepo.git

Conflicts:
	GitTest/src/es/mivic/gittest/Main.java
Output message changed