Modified gitignore to ignore sublime project and workspace files
Fixed merge conflicts