changed descp
Merge branch 'master' of https://github.com/bguggs/EcocampHackathon2014