Merge branch 'master' into master

Author: BeastCode

README.md

@@ -136,6 +136,8 @@ You don't need to type any dashes: "ngrxr" -> "ng-rx-reducer" snippet
 | m-button-fab-mini | Small circular button w/ elevation. |
 | m-button-icon | Circular Material button with a transparent background |
 | m-button-raised | Rectangular Material button w/ elevation. |
+| m-button-flat | Rectangular Material flat button. |
+| m-button-stroked | Rectangular Material button with a transparent background and a stroke. |
 | m-button-toggle | Material toggle button |
 | m-card | Material Basic Card |
 | m-card-full | Material Card |

snippets/html.json

@@ -1382,5 +1382,5 @@
       "<ng-content #${1:name}></ng-content>",
       "$0"
     ]
-  }
-}
+	}
+}