Updated notes
Reconcile
Merge branch 'master' of https://github.com/obdurodon/CollateOS