still trying to fix the navbar to not blow up when active
Merge branch 'master' of github.com:4grim/asyncio-aggregator

updating remote