Changed tool bar css and other stuff
fixed merging issues
Merge branch 'master' of https://github.com/mjfuller/digestible