FIX TOOLBAR
Merge branch 'master' of https://github.com/stevenalvarez/lineup