updated splash page
Merge branch 'master' of https://github.com/whyu/PoolParty
UPdated schema
Merge branch 'master' of https://github.com/whyu/PoolParty
capybara and cucumber
Merge branch 'master' of https://github.com/whyu/PoolParty into development