刪除a.html
重新命名b -> b.html, c -> c.html
新增add.html
新增add.html
Merge branch 'developer2'

Conflicts:
	add.html