favicon added
add video conflict added
Merge pull request #80 from emocentmagar/lalit

Lalit