Merge remote-tracking branch 'upstream/master'
added twitter folder
Merge pull request #11 from IguanaMeow/master

update