Implemented FB login
Merge branch 'master' of https://github.com/ericapadilla/testRepo

Conflicts:
	package.json