david's late night changes on Wed - a lot of shit
good merge shit
Merge branch 'master' of https://github.com/daviddworsky/capture-app-final
david's late night wed changes - already merged with Nick and Brian's work