some bullshit again
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/anwts/com/wheretoshop/HomeActivity.java
Merge remote-tracking branch 'origin/master'
some bullshit again
Merge remote-tracking branch 'origin/master'