update gitignore
create _draft folder
move posts to _draft folder
add favicon
edit
resolve conflict