Merge pull request #116 from polynickglot/master

Bootstrap material design (fix merge conflict)