Initial commit
Fix merge conflict with LICENSE