- FB changes
Merge branch 'master' of https://github.com/carlosvillademor/myJourney

Conflicts:
	js/server.js