diff --git a/20170306_stammtisch.md b/20170306_stammtisch.md
new file mode 100644
index 0000000000000000000000000000000000000000..3396d70006d301b9890833d571aa291790046850
--- /dev/null
+++ b/20170306_stammtisch.md
@@ -0,0 +1,67 @@
+# Todays questions:
+
+- Florian VIM as Python IDE
+- Maria when did a line of code change (yeah actual git question)
+- Maria how to check out individual file (with a new name)
+- Christian how to add users to a group in Linux
+- Christian file directory structure in Linux
+- Maria optparse in R debugging
+
+
+# organisational
+- invite attendees to common git group
+- prepare git training where all do stuff on shared repo and resolve resulting problems
+- prepare git workflows hands on
+- we have new group https://git.idiv.de/stammtisch and a new project https://git.idiv.de/stammtisch/git-stammtisch.git
+
+# answers
+## Florian, VIM as Python IDE
+- tmux and vim, have a look at https://git.idiv.de/scientific-computing/RStudio-Docu/blob/master/tmux.md
+- search for tmux, vim and python PEP8
+- use ! to execute commands from inside vim on the command line, e.g. the following will run wc on the current file
+  {{{
+  :! wc % 
+  }}}
+- search for dotfiles
+
+## Maria, ask git when a line of code did change
+git will tell you in which commit a file changed
+{{
+git log dotfile.yml
+}}}
+
+git will tell you when the line range in a file changed
+{{{
+git log -L 10,12:dotfile.yml
+}}}
+
+git will tell you when a function in a file changed
+{{{
+git log -L :is_workday:analysis.r
+}}}
+
+## Maria how to check out individual file (with a new name)
+{{{
+git checkout  14134e6 muhkuh
+}}}
+
+or to a new file (mind the :)
+{{{
+git checkout  14134e6:muhkuh > newkuh
+}}}
+
+## Christian how to add users to a group in Linux
+{{{
+usermod -a -G groupName userName
+}}}
+
+## Christian file directory structure in Linux
+Why do you need a /?
+
+- Everything starts at / (say root).
+- Your user usually has a home directory like /home/username
+- There is a relative and absolute path
+    - a absolute path starts with /
+- https://wiki.ubuntuusers.de/Verzeichnisstruktur/
+
+## Maria, optparse in R debugging#