joel's branch stuff
Merge pull request #7 from GJST-Capstone/gregory

Gregory
added joel.html for testing
Merge pull request #8 from GJST-Capstone/joel

Joel 12/2
adding new files for joel