Adding twitter sharing
Fixing conflicts