changes
Merge branch 'master' of https://github.com/KernelCorp/kogdata2
messages work, almost done
conflict