updated the styleguide and changed the path for the written and markdown guide
fixing conflicts