cleaning up
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/strings.xml
cleaning up, removing comments, washing the dishes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/zwaggerboyz/instaswaggify/MainActivity.java
	app/src/main/res/values/strings.xml
cleaning up, washing the dishes
Merge remote-tracking branch 'origin/master'