changjian is ok now
before merge issue_15
commit to merge issue 15
merge
issue_#15 ok initial screen
checkout to master
merge issue_#15 ok