not sure...
Reknit some files
Added html files (except those in the slides folder)  to .gitignore
Add back missing html files
Fixed conflict in .gitignore