added a pull and a status to the gh-pages deploy script
i think i fixed the collision finding error
merging master to gh-pages