tmp

tmp
Merge branch 'master' of https://github.com/earth660/oz

Conflicts:
	app/assets/stylesheets/form/._form.css
	app/views/home/._teacher_form.html.erb