merge fix
another merge fix
Merge pull request #13 from musalbas/master

merge
fixed emoji and tweet displaying
merge conflict
Merge pull request #7 from markormesher/master

merge