my commits from my branch
testing
Fixed merge conflict
Merge pull request #1 from joshuamaxwell/katy

testing
Edwin's 1st commit
Merge pull request #2 from joshuamaxwell/edwin

Edwin's 1st commit
page framework change