Merge remote-tracking branch 'matzew/master' (pull request #418)

jspahrsummers · jspahrsummers · commit 77e8071b0fd9 · 2013-07-02T13:09:57.000-07:00
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
@@ -15,3 +15,7 @@ profile
 DerivedData
 .idea/
 *.hmap
+
+#CocoaPods
+Podfile.lock
+Pods
