added f1, f2, d1/f3 and d2/f4
modified f1 and f2
added .gitignore