fixed ejs server tag typos in act 2. made more clear where some code snippets should go in act 2
fixed merge conflict
added many clarifications to slides in act 2