adding files from master to gh-pages since rebase was being stubborn!