Initial commit
Resolved conflicts
Added workspace settings