new testhaikus, main file
Merge branch 'master' of https://github.com/haeunchang/CS51-Final-Project