adjustments, notes week 1

diff --cc _topics_and_themes.mdwn
Simple merge

diff --cc index.mdwn
index 6b7f1d9,b31723a..c581a3e
--- 1/index.mdwn
--- 2/index.mdwn
+++ b/index.mdwn
@@@ -38,12 -36,9 +38,12 @@@ we'll be doing the next week. It would 
  week's homework, for instance, before the session.
  -->
  
- *   Here is information about [[How to get the programming languages running on your computer]].
+ *   Here is information about [[How to get the programming languages running on your computer|installing]].
  
 -*   Here are [[Lecture notes for Week 1|topics/week1]]; and [[the homework|exercises/assignment1]]. There are also some [[advanced notes|topics/week1 advanced notes]].
 +* Here are lecture notes for week 1: [[order|topics/week1 order]];
 +[[the introduction to functional programming|topics/week1]], along
 +with [[the homework|exercises/assignment1]] and some [[advanced
 +notes|topics/week1 advanced notes]].
  
      > Topics: Basics of Functional Programming