Merge pull request #3 from davecheney/fix

removed memory management and reorg

Author: campoy

5-execution-tracer/1-execution-tracer.md

@@ -216,4 +216,4 @@ Try to find other cool modifications that change the trace.
 
 ## Congratulations
 
-Now let's talk about memory management in the [next chapter](../6-memory-management/1-memory-management.md).
+Now let's talk about memory management in the [next chapter](../6-tips-and-tricks/1-tips-and-tricks.md).

6-memory-management/1-memory-management.md

@@ -19,13 +19,13 @@ Through the day we'll work from the small -- learning how to write benchmarks, t
 | 09:30 | [Benchmarking (dfc)][2] |
 | 10:15 | Break (15 minutes) |
 | 10:30 | [Compiler optimisation (dfc)][3]|
-| 11:15 | [Profiling (dfc)][4] |
-| 12:00 | Lunch (90 minutes) |
+| 11:15 | [Profiling (francesc)][4] 
+| 12:00 | Lunch (90 minutes) | 
 | 13:30 | [Execution tracer (francesc)][5] |
-| 14:30 | [Tips and tricks (dfc)][7] |
+| 14:30 | [Tips and tricks (dfc)][6] |
 | 15:15 | Break (15 minutes) |
 | 15:30 | Exercises |
-| 16:45 | [Final Questions and wrap up][8] |
+| 16:45 | [Final Questions and conclusion][7] |
 | 17:00 | Close |
 
 
@@ -38,6 +38,5 @@ This repository is licensed under the [Creative Commons Attribution-ShareAlike 4
 [3]: 3-compiler-optimisations/1-compiler-optimisations.md
 [4]: 4-profiling/1-profiling.md
 [5]: 5-execution-tracer/1-execution-tracer.md
-[6]: 6-memory-management/1-memory-management.md
-[7]: 7-tips-and-tricks/1-tips-and-tricks.md
-[8]: 8-conclusion/1-conclusion.md
+[6]: 6-tips-and-tricks/1-tips-and-tricks.md
+[7]: 7-conclusion/1-conclusion.md