add task
add task file
merge
merge
modify git igonre