add != to operators
doesn't know what are these...
add .DS_Store to .gitignore
edit the diagram part
Merge remote-tracking branch 'origin/master'