ignore equals
Merge branch 'master' of https://github.com/fredfeng/Scuba
stub methods
resolve conflict