conflict resolution
Merge branch 'development' of https://github.com/whyu/PoolParty
added classes and unique ids to table rows
Merge branch 'master' of https://github.com/whyu/PoolParty into development