added documentation, removed printlns
fixed merge conflicts
Merge branch 'master' of https://github.com/ryanm8/MakeMyChoice-GoodCall