Working on mysteries and aabout page.
fixing merge conflicts
adding new files