fixed bug with how many papers there are with other options
fixed conflicts
Merge branch 'master' of https://github.com/hmslydia/frenzy2