adding twitter incorporation
fixing merge conflict
removing giant library folder