Updates
Merge branch 'master' of https://github.com/lozano-jorge/Vapec

Conflicts:
	src/assets/css/main.css