archive.php to taxonomy.php
Merge remote branch 'origin/master'