Added MIT License
Fixing merge conflict