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