Update app.js
Update index.html
Update index.html
FBLOGIN
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	js/app.js
2
Merge pull request #8 from rob0215/master

2