Initial commit
.sublime-workspace folder path fix
Merge conflicts and small fixes