12112014
SignUp
mergeSolved
SignUpFuncionando
private.xml issue
Paginas_de_upload
merging from Mauri
ignore private.xml
changing form action to not use home directory
Paginas_de_upload
changed homepage to index.jsp and added header and footer to web-inf
Paginas_de_upload
merged
private issue
Merging Paginas do Paulo com Paginas do Mauri (login e sign up)
bad versiongit add -A several issues
Merged done, still need to test it
Merging Paginas do desenvolvedor (paulo) com master
renaming PáginaDoDesenvolvedor removendo o acento
removing conflitct from xml file