moving changes in gh-pages into master

have added lots of content, want it to be consistent