Merge pull request #39 from coryasato/master

events to db
fixed routing