first commit
changed index.html
Merge branch 'master' of https://github.com/dyc5828/itp460
Merge branch 'new-feature'