Update readme with all branch push to Github
Fix conflict
Change gitignore