second modification of mike.html
Merge branch 'master' of https://github.com/mikecolbert/mergeTest