Merge upstream master and format HTML

This commit is contained in:
Tyler Vigario
2020-06-01 17:24:21 -07:00
11 changed files with 339 additions and 626 deletions

File diff suppressed because one or more lines are too long