--- a/LINKS	Fri Mar 10 23:01:17 2017 +0000
+++ b/LINKS	Wed May 31 09:26:08 2017 +0100
@@ -1,6 +1,45 @@
+why functional programming matters
+http://queue.acm.org/detail.cfm?id=2038036
+
+
+
+BufferOverflow
+http://seclists.org/oss-sec/2017/q2/344
+
+
+=========
+Intro Videos
+https://www.youtube.com/watch?v=ugHsIj60VfQ (30:00 slide about functions)
+
+https://www.youtube.com/channel/UC1VAdzkoY7M2e3msbW9Ur8w/videos?shelf_id=0&view=0&sort=dd
+
+
+===============
+Scala warts
+http://www.lihaoyi.com/post/WartsoftheScalaProgrammingLanguage.html
+
+https://www.reddit.com/r/scala/comments/616n3y/could_anyone_recommend_scala_resources_that/
+================
+
+
+online compiler
+https://scalafiddle.io/
+http://www.scala-lang.org/blog/2017/05/19/scastie.html
+
+
+------------------
+Book
+http://twitter.github.io/effectivescala/
+-------------------
+
+Very good explanation of what being functional programming means
+https://dotboris.github.io/2017/04/07/functional-programming/
+
+
 Source of exercises
     http://exercism.io
-
+    https://www.scala-exercises.org/
+    http://www.sofiacole.com/technology/adopting-scala-the-next-steps/
 
 
 https://medium.com/@markcanlasnyc/scala-saturday-functions-for-the-object-oriented-4218f9ed192b#.dw8x8zxvb
@@ -20,4 +59,31 @@
 
 -------------------
 collatz
-http://codepen.io/benlorantfy/pen/KWzXoX
\ No newline at end of file
+http://codepen.io/benlorantfy/pen/KWzXoX
+
+-------------------
+cheat sheets
+
+https://mbonaci.github.io/scala/
+http://alvinalexander.com/downloads/scala/Scala-Cheat-Sheet-devdaily.pdf
+http://homepage.cs.uiowa.edu/~tinelli/classes/022/Fall13/Notes/scala-quick-reference.pdf
+
+https://www.youtube.com/watch?v=RZEZp8fqn_0
+
+-------------------
+scala books
+http://underscore.io/training/
+
+-------------------
+dependent types in Scala
+https://stepik.org/course/ThCS-Introduction-to-programming-with-dependent-types-in-Scala-2294/
+
+
+--------------------
+chess engine in scala
+http://marianogappa.github.io/software/2017/03/24/ostinato-a-chess-engine-written-in-scala-that-runs-on-the-browser-docker-and-the-repl/
+https://en.lichess.org
+
+---------------------
+scala code quality
+https://www.reddit.com/r/scala/comments/616n3y/could_anyone_recommend_scala_resources_that/

--- a/marking/mark01a	Fri Mar 10 23:01:17 2017 +0000
+++ b/marking/mark01a	Wed May 31 09:26:08 2017 +0100
@@ -1,5 +1,8 @@
 #!/bin/bash
-set -e
+
+# try this to make it fail safely
+set -eu -o pipefail -posix
+#set -e
 
 out=${1:-output}
 

--- a/progs/knight4.scala	Fri Mar 10 23:01:17 2017 +0000
+++ b/progs/knight4.scala	Wed May 31 09:26:08 2017 +0100
@@ -43,3 +43,6 @@
 val starts = for (i <- 0 until n; j <- 0 until n) yield (i, j)
 
 starts.par.foreach((x:(Int, Int)) => tour(n)(List(x))) 
+
+
+