Edits before presentation
Building a big-ass db
deleted db because it was being stupid :(
Merge remote-tracking branch 'upstream/master'
added same database... don't ask
Merge pull request #62 from AaronTR/master

Fixed db conflict issues. ZMQ/GUI changes