initial commit
fixing conflict
initial config
config: permalink style