Merge pull request #1070 from elect86/patch-1
authorKim Kulling <kimkulling@users.noreply.github.com>
Fri, 18 Nov 2016 13:56:22 +0000 (14:56 +0100)
committerGitHub <noreply@github.com>
Fri, 18 Nov 2016 13:56:22 +0000 (14:56 +0100)
Update material.h


Trivial merge