finish fb login
Merge branch 'master' of https://github.com/chrisjbaik/sawadicop

Conflicts:
	.gitignore
	public/index.php
	views/login.php