resolving conflicts
Merge branch 'master' of https://github.com/Jyeil/projectS3
reverse a pentomino WO