Define FB
Merge branch 'master' of https://github.com/rogeherlor/Besok

Conflicts:
	public/app_js.js
	views/app_erb.erb
Update