stash to pull
Merge branch 'master' of github.com:abmcdubb/troop_hub
reordered event routes so they dont overried. cleaned up other event details