updated profile page
conflict resolution
Merge branch 'master' of https://github.com/whyu/PoolParty into development
Merge branch 'development' of https://github.com/whyu/PoolParty