Bloggy Creation
merged conflict in gitignore