fixed friend function
Merge branch 'master' of github.com:jmadden85/twitblocker