Merge pull request #1 from hevertonrodrigues/master

start rails app
Merge branch 'master' of https://github.com/hevertonrodrigues/PhasksOnRails
Colaboradores e Funcoes
Merge pull request #2 from thiagosf/master

Colaboradores e Funcoes