Merge branch 'search-hotfix'
endpoint seems to work, need to test
add html extension
fixed dumb-ass null guarding error
Merge branch 'username-reserve'
Merge commit '1cfc0b88c354deb66da1334cea0f68a60d0b3a33' into heroku