basic html structure
Merge remote-tracking branch 'upstream/master'

Merging
Merge pull request #2 from echen027/master

Basic html structure