Merge branch 'master' of github.com:juanignaciosl/wedding-tables-planner-web

Conflicts:
	.README.md.html
	README.md
Merge branch 'master' of github.com:juanignaciosl/wedding-tables-planner-web

Conflicts:
	.README.md.html
	README.md
Fixed path