added the facebook and regular login code
added the facebook and regular login code
Merge pull request #13 from Neohuman/master

Added Login Code
fixes to fbAuth
Merge branch 'Neohuman-master'

Conflicts:
	app/index.html
	app/scripts/services/fbauthenticationServices.js