"fb auth"
fbauth
Merge branch 'master' of github.com:zeppelinnn/Contact

Conflicts:
	.DS_Store