joel's branch stuff
added joel.html for testing
Merge pull request #8 from GJST-Capstone/joel

Joel 12/2