fixed code link
added style guide
added guides
resolve merge conflicts