임제인 Jane Im

Results 1 comments of 임제인 Jane Im

Fixed conflicts. They were simple ones. But since this branch contains changes from #73 , could you first take a look at it? **TO CLARIFY, THIS BRANCH...** Includes resolving issues...