ignore design folder
Merge branch 'markup'