New home for PYP Proyectos
installing bootstrap
Merge branch 'master' of https://github.com/oskamaya/pyp-proyectos

Conflicts:
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
Revert "Merge branch 'master' of https://github.com/oskamaya/pyp-proyectos"

This reverts commit eb4c583fb0dc4d6f1033bb97e4d214aa863c53a9, reversing
changes made to 5a784180a5f9c9d4ee6ebf8773ac5289e07d73dd.