fixing more merge issues
Merge pull request #101 from LandonVance/fbshare

fixing more merge issues