From 11e6f0b69ea1806c05039c8887ecb0a4153fa982 Mon Sep 17 00:00:00 2001
From: Milad Khajvi <khajavi@gmail.com>
Date: Wed, 25 Mar 2015 12:35:17 +0430
Subject: [PATCH] update scala

---
 .gitignore                | 1 +
 free-programming-books.md | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..b25c15b8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/free-programming-books.md b/free-programming-books.md
index f93c1a1d..2b22eecb 100644
--- a/free-programming-books.md
+++ b/free-programming-books.md
@@ -1693,6 +1693,7 @@ See also [TeX](#tex)
 * [tetrix in Scala](http://eed3si9n.com/tetrix-in-scala-html5-book)
 * [The Neophyte's Guide to Scala](http://danielwestheide.com/scala/neophytes.html) - Daniel Westheide
 * [Xtrace](http://github.com/leithaus/XTrace/tree/monadic/src/main/book/content/)
+* [Learning Scala; Jason Swartz; 2014](http://chimera.labs.oreilly.com/books/1234000001798/index.html) + [LearningScalaMaterial](https://github.com/swartzrock/LearningScalaMaterial)
 
 
 #### Lift