Adding all the files
Adding LICENSE
Fixing merge conflict for LICENSE