Merged all curriculum, updated css for choice.php, made most links point to legitimate pages.