html/css/js

This is what I've worked on via site
Merge pull request #1 from helloimowen/Kyle-Branch

html/css/js