Merge branch 'master' into drew
finished pages
fixed num eating placement
Merge branch 'master' into drew
Merge branch 'drew'