개망;;
ㄴㅇㄹㄴㅇㄹ
ㅁㄴㅁㅇㅁㄴㅇ
asdasd
sadasd
saasd
Merge branch 'master' of https://github.com/JeremyJeong/FTCoverflow

Conflicts:
	FTCoverflow/src/com/boxofjeremy/ftcoverflow/FTMainActivity.java