Checkpoint maqueta
Merging master
View register
View page client
View client
Merge branch 'maqueta' of https://github.com/CreativeHole/ejairn

Conflicts:
	app/src/templates/register.js
Last view Home client
Merge branch 'maqueta' of https://github.com/CreativeHole/ejairn
View home client
Merge branch 'maqueta' of https://github.com/CreativeHole/ejairn
done