Version 2 - merge with gh-pages (again, more updated)

Merging Version 2 with default branch. All content from wiki now added to the relevant pages.

TO-DO:
Add content to Episodes page, and About page.