updated per TA instructions
Merge branch 'master' of https://github.com/adamrcaldwell/cf-topstateshtml