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

Conflicts:
	app/assets/images/._option.png
	app/assets/images/._subject.png
	app/assets/javascripts/home/._jqdoc.js
	app/assets/stylesheets/searches/._howuse.css
	app/views/searches/._howto_use.html.erb
add to teacher_report erg
add to picture
Merge pull request #11 from earth660/addcss

Addcss