El comienzo
Merge branch 'master' of https://github.com/Onlycorn/capua

Conflicts:
	.DS_Store
	client/views/home/home.html