fixed some shit that throw extensions
Merge branch 'master' of https://github.com/redaphid/fb-hackathon

Conflicts:
	app.js
	modules/facebook.js
	public/html/index.html