Commitando e mergeando
Merge branch 'master' of https://github.com/Arc2014/first.git

Conflicts:
	primeiro-projeto-git/src/TestJavaGit.java