조태상:버튼 수
Merge branch 'master' of https://github.com/SaturdayPeople2012/GIFViewer

Conflicts:
	GIFViewer.xcodeproj/project.pbxproj