풀받기위해 또 커밋…
이미 주석처리해논게 충돌나서 커밋을 해야되네요
Merge branch 'master' of https://github.com/SaturdayPeople2012/GIFViewer

Conflicts:
	GIFViewer/GIFDetailViewController.m
	GIFViewer/ListViewController.m