Merge branch 'gh-pages'
did some moving/refactoring
changed the view a little