updated conflicts
Merge branch 'master' of https://github.com/whyu/PoolParty