preparing our gh-pages
changed link to opensas blog article
fixed conflicts