pre merge
pre merge
updated show page
end of Friday push
fixed conflicts
pre merge
updates missing
Merge pull request #6 from JoyP/showPage

Show page