Filters working
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/ca/tannerrutgers/ImageFilter/Utils/BitmapUtils.java
	src/ca/tannerrutgers/ImageFilter/activities/MainWindow.java
	src/ca/tannerrutgers/ImageFilter/models/ImageFilter.java