Merge pull request #23 from victorleungtw/master

resolve merge conflict
Merge pull request #24 from victorleungtw/master

changes label to bottom
Merge branch 'master' of github.com:Green-Snake-Platinum-Kangaroo/kitchencooks