test

test
test
add

new
delete

delete index2.html
Merge branch 'zongyuan.song'
Remove hardcoded html file.
Merge branch 'master' into branch-lingjun

Conflicts:
	js/app.js