twitter
Merge branch 'master' of https://github.com/mrt168/Create-GifMagaine.git

Conflicts:
	GifMagazine/src/jp/createbox/gifmagazine/MainActivity.java