go
sd
Merge branch 'master' of https://github.com/iamyup/cultureshock.git

Conflicts:
	buskingbook/res/drawable-xhdpi/busker_page_btn.png
	buskingbook/res/drawable-xhdpi/busker_page_btn_o.png