Removed conflicts
Merge branch 'gh-pages'