Facebook login done
Merge branch 'master' of https://github.com/simpleclicks/travelIte

Conflicts:
	www/index.html