Merge pull request #1 from FezVrasta/master

asd
Merge pull request #2 from FezVrasta/master

asd
added black and white buttons
new generic mixin
fix and added 'inverse' color
commented unnecesary style
placeholder working correctly
explanation added
merging material colors
Merge branch 'korgan00#master'

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master'