Merge branch 'master' of C:\Users\Peter\Desktop\Multimedia\InstaSwaggify with conflicts.
o-checks en commentaar
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/zwaggerboyz/instaswaggify/AbstractFilterClass.java