added matt's html code
added matt's answer key
resolved conflicts
 didn't change anythign important