Merge pull request #146 from the-self-taught-programmer/issue#136

Fix Issue #51 and #136

Author: taoqf

.gitignore

@@ -18,6 +18,7 @@ bower_components
 *.sublime-*
 dist/
 yarn.lock
+package-lock.json
 .yarnrc
 
 .idea

.prettierrc

@@ -0,0 +1,7 @@
+{
+    "trailingComma": "es5",
+    "useTabs": true,
+    "tabWidth": 4,
+    "printWidth": 140,
+    "singleQuote": true
+}