Initial commit
Fixed initial commit merge conflict
Added License