extension filtering
Merge branch 'master' of github.com:RainNapper/15498_term-project

Conflicts:
	static/js/timeline.js
	static/timeline.html