simple puppet.. changed vm box
precise32
chau submodulo
chau submodulo
limpieza
submodulo app django
rearmado de puppet
vagrant fix
asd
fix virtualenv in puppet
asd
Merge branch 'simplificando-la-vm'

Conflicts:
	.gitignore