styling adjustments
fixed conflicts
removed waves from tabs
Merge branch 'master' of github.com:Dogfalo/materialize