in progress facebook login stuff
Merge branch 'master' of git@github.com:fattchris/MUSElink.git

Conflicts:
	lib/includes.inc
	public_html/header.inc
99% done on facebook login and linking
Merge branch 'master' of git@github.com:fattchris/MUSElink.git
Merge branch 'master' of git@github.com:fattchris/MUSElink.git