more changes
Finish first iteration of skeptics page
fix conflict