add a line in test.txt
add a line in dev
add some word
aa
test --on-ff
finish work
Merge pull request #1 from epooren/dev

Dev