server funcionando
Merge branch 'Finalround' of https://github.com/mdiss2012-socialpics/socialpics_webapp into Finalround