made a change to pauls page
fixed merge conflict with james' pull request
Merge pull request #4 from vivekmshah/james

made a change to pauls page