merged with Kush's html/other files
Merge pull request #3 from DanielHopper/daniel

merged with Kush's html/other files