commit before pull
modified gitignore
commit before pull
updated
Merge branch 'master' of https://github.com/kuldeeprishi/blog_project
setting file reorganized
merges fixed