Merge branch 'dev'
D txt file added
Merge branch 'dev'
D txt editted
Merge branch 'dev'
E txt added
Merge branch 'dev' of https://github.com/alhenk/ff into dev