[Kali] Lista
Merge branch 'master' of https://github.com/carlosvillademor/myJourney

Conflicts:
	static/css/main.css
Merge branch 'master' of https://github.com/carlosvillademor/myJourney