Novo arquivo
Merge branch 'master' of github.com:Didox/rails
arquivo novo
alterado
philipe.txt alterado novamente
Merge branch 'master' into philipe

philipe.txt mergeado