Filters Implemented
Merge branch 'master' of https://github.com/osurdml/flame2.0

Conflicts:
	Flame/FrontierController.py