test push
Merge branch 'master' of https://github.com/mathijs727/InstaSwaggify
Merge branch 'master' of https://github.com/mathijs727/InstaSwaggify
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/mathijs727/InstaSwaggify
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/zwaggerboyz/instaswaggify/MainActivity.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
drag and drop fix
Merge remote-tracking branch 'origin/master'