branch test
AND simple
& simple
conflict fixed
dev add 'Hello'
master add 'World'
Merge branch 'dev'
add .gitignore file
add menu.pdf file
start project0