added directions
fixed merge conflicts in index.php