Inside Buildings

create the structure of every building
Merge branch 'camilo'

Conflicts:
	Gruntfile.js
	Principal/client.js
Merge branch 'master' into Felipe