Facebook auth
Merge branch 'master' of https://github.com/pinya/ttt

Conflicts:
	Gemfile