Create LICENSE
Added MIT License
resolve conflict in LICENSE
Merge branch 'master' into devel