Merge pull request #5 from tbergeron/master

Fixed podspec

M13ProgressSuite.podspec

@@ -1,6 +1,4 @@
 Pod::Spec.new do |s|
-
-<<<<<<< HEAD
   s.name         = "M13ProgressSuite"
   s.version      = "1.0.0"
   s.summary      = "A suite containing many tools to display progress information on iOS."
@@ -34,43 +32,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
   s.source_files  = 'Classes/*/*'
 
   s.frameworks = 'Foundation', 'UIKit', 'QuartzCore', 'CoreImage', 'Accelerate', 'CoreGraphics'
-=======
-
-
-  s.name         = "M13ProgressSuite"
-  s.version      = "1.0"
-  s.summary      = "A suite containing many tools to display progress information on iOS."
-
-  s.description  = <<-DESC
-                   All of which can be accessed by index, or key. This class is not a minimally finished class, with one or two methods. It follows Apple's subclassing protocols for NSArray and NSDictionary. It has methods comparable to all of NSArray's methods and all of NSDictionary's methods. It also supports NSCoding, NSCopying, KVO, and supports NSFastEnumeration over the objects or keys. It is the only fully implemented ordered dictionary class.
-                   DESC
-
-  s.homepage     = "https://github.com/Marxon13/M13ProgressSuite"
-
-
-  s.license      = 'MIT'
-
-
-
-
-  s.author       = { "Brandon McQuilkin" => "[email protected]" }
-
-
-
-  s.ios.deployment_target = '7.0'
-
-
-
-  s.source       = { :git => "https://github.com/Marxon13/M13ProgressSuite.git", :tag => "v#{s.version}" }
-
-
-
-
-  s.source_files  = 'M13ProgressView/Classes/{Console,HUD,Progress Views,UINavigationController}/*
-
-  s.framework  = 'Foundation','Accelerate','CoreImage','QuartzCore','CoreGraphics','UIKit'
 
   s.requires_arc = true
-
->>>>>>> b736abe86233310d24ae226402a9c05c37c3b6b6
 end