Merge pull request #2 from colinkho/master

Initial Test Commit for Colin Kho
Jory's Commit Test
Merge pull request #3 from joryrice/master

Jory's Commit test