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

This commit is contained in:
Justin Spahr-Summers
2013-07-02 13:09:57 -07:00

View File

@@ -15,3 +15,7 @@ profile
DerivedData
.idea/
*.hmap
#CocoaPods
Podfile.lock
Pods