Initial commit
Added license
Fixed merge error