shizzle
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/zwaggerboyz/instaswaggify/FilterListAdapter.java
Merge branch 'master' of https://github.com/mathijs727/InstaSwaggify
scale basics
Merge remote-tracking branch 'origin/master'