Merge branch 'master' of github.com:Aaronepower/tokei

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 2.1.0
+Tokei, can now output results in various formats(_cbor, json, yaml_)
+
+Conversely tokei can now take in results in those formats, and add them to the current run.
+
+Premilarily support for nested comments(_currently only rust supports it_)
+
+Change in the output format [PR #35](https://github.com/Aaronepower/tokei/pull/35)
+
+Moved  `.sc` from Lisp to Scala.
+
+Internals changed to allow for multiple multi line comment formats.
+
+**Added languages:**
+- Isabelle
+
 # 2.0.0
 
 Major rewrite, now parallelized.
@@ -5,7 +21,7 @@ Can now support sorting files.
 Added a progress message for when it is counting files.
 Fixed #29
 
-Added languages:
+**Added languages:**
 - Coq
 - Erlang
 - Kotlin
@@ -26,7 +42,7 @@ Added file counting.
 
 Added Shebang support.
 
-Added languages:
+**Added languages:**
 - Assembly
 - LD Scripts
 - Device Trees