Teve de ser
Merge branch 'master' of https://github.com/Laurinha/projava.git
Merge branch 'master' of https://github.com/Laurinha/projava.git