Facebook login and logout works with the buttons now
Fixed bug that caused comments not to load
Merge remote-tracking branch 'upstream/master' into merging

Conflicts:
	controller.js
	index.html
	model.js