Add filter
Merge branch 'master' of github.com:s-hiroshi/imagedata

Conflicts:
	filtering/filter.js
	filtering/index.html