branch test
AND simple
& simple
conflict fixed
add merge
add dev.html
add gitignore
Merge branch 'dev'