push kiwi name
delete .bak file
add test #1 and pass test #1
Merge branch '1-lecturer'
resolve conflict