add michael1.txt
add michael2.txt
merge michael in branch dev