Toolbar
Merge branch 'master' of https://github.com/rbao/csc318