events displaying in proper order
Merge seems to have gone smoothly
Merge branch 'master' of https://github.com/daviddworsky/capture-app-final