Merge pull request #1 from KISRDevelopment/master

updating to the latest
added my email and github account
added socialmedia handler
resolved conflict