basic html
min.js merge
Merge branch 'master' of github.com:rwagner00/wtfitp