added problem text
added problem text
resolved merge conflicts
Merge branch 'master' of https://github.com/RafaelMarinheiro/CS6644