edit-boxes
clearing
home_edit_2
Merge branch 'master' of https://github.com/tkwon/htmlcss

Conflicts:
	school_template_classroom/home_edit.html