Bunkertype
Merge branch 'master' of https://github.com/Pabloblicuo/typomad2014

Conflicts:
	actividades.html
	entradas.html
	espacio.html
	expos.html
	index-english.html
	index.html