bulk updates
bulk updates
Conflicts:
	templates/base.html
delete some file
Modify styel and base