fixed facebook
Merge branch 'master' of github.com:konscript/whosup

Conflicts:
	client/app/index.html
	client/app/js/controllers.js
Merge branch 'master' of github.com:konscript/whosup