Todo listo menos css
Merge branch 'master' of http://github.com/assm4n/pp2