Updating tags and adding config file
Merge branch 'master' into gh-pages

Merging the site
Editing tags