toc
added facebook login
Merge branch 'master' of https://github.com/Nardoz/PensaVerde

Conflicts:
	controllers.js