Successfully authenticated from Facebook account.
merge masrter into fb branch
Merge pull request #5 from rhokbrisbane/fb

Fb
Merge branch 'master' into haml

Conflicts:
	app/views/layouts/application.html.erb