Updated FOAF, GA, remove FB
Merge branch 'master' of https://github.com/cmelendez/cmelendez.github.com

Conflicts:
	index.html