Initial commit
Added LICENSE and README
Fixing merge conflict