add content to page
Merge branch 'calvin_branch'

merge calvin and michael's code