initial commit
added fb keys, git ign
merge conflicts