First commit
Add LICENSE and fix conficts