.gitignore!!!
Merge branch 'master' of https://github.com/peterkshultz/Blocstagram

Conflicts:
	DerivedData/Blocstagram/Build/Intermediates/Blocstagram.build/Debug-iphonesimulator/Blocstagram.build/dgph
	DerivedData/Blocstagram/Build/Intermediates/Blocstagram.build/Debug-iphonesimulator/BlocstagramTests.build/dgph
	DerivedData/ModuleCache/NVX3IAQDNJIK/CFNetwork-3W4ZEWZBGPTD0.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/CoreFoundation-39FSSU6DLRUW0.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/CoreGraphics-3W4ZEWZBGPTD0.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/CoreImage-3W4ZEWZBGPTD0.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/CoreText-3W4ZEWZBGPTD0.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/CoreVideo-YI8W00NZJUXQ.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/Dispatch-2YOW4C0ETMKER.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/Foundation-EYOSPQTLKL5Q.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/MachO-1ZM9O43WGLXBM.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/ObjectiveC-2UKHEA5J1CPD4.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/OpenGLES-1ZJYARNS24OZP.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/QuartzCore-35US9KADCQQAP.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/Security-32XJ217MROISC.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/UIKit-301UUGFC4BK8R.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/XCTest-XNS9A2KI9FIU.pcm
	DerivedData/ModuleCache/NVX3IAQDNJIK/modules.idx
	DerivedData/ModuleCache/NVX3IAQDNJIK/os-2NORS7MYEGVY3.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/CFNetwork-3W4ZEWZBGPTD0.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/CoreFoundation-39FSSU6DLRUW0.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/CoreGraphics-3W4ZEWZBGPTD0.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/CoreImage-3W4ZEWZBGPTD0.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/CoreText-3W4ZEWZBGPTD0.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/CoreVideo-YI8W00NZJUXQ.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/Dispatch-2YOW4C0ETMKER.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/Foundation-EYOSPQTLKL5Q.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/MachO-1ZM9O43WGLXBM.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/ObjectiveC-2UKHEA5J1CPD4.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/OpenGLES-1ZJYARNS24OZP.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/QuartzCore-35US9KADCQQAP.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/Security-32XJ217MROISC.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/UIKit-301UUGFC4BK8R.pcm
	DerivedData/ModuleCache/RQLEBIUMMYT3/modules.idx
	DerivedData/ModuleCache/RQLEBIUMMYT3/os-2NORS7MYEGVY3.pcm
removed derivedData
Bug fix