diff --git a/THANKS b/THANKS
index d6e38696..e4bb8720 100644
--- a/THANKS
+++ b/THANKS
@@ -140,3 +140,4 @@ Heinz N. Gies
 Roberto Aloi
 Andrew McRobb
 Drew Varner
+Niklas Johansson
diff --git a/priv/templates/gitignore b/priv/templates/gitignore
index 40ca6526..f1c45545 100644
--- a/priv/templates/gitignore
+++ b/priv/templates/gitignore
@@ -16,3 +16,4 @@ _build
 .idea
 *.iml
 rebar3.crashdump
+*~