first commit for gh pages
fix linking for gh pages
fix conflict