Conflicts: .gitignore SparkleShare/SparkleIntro.cs SparkleShare/SparkleShare.cs SparkleShare/SparkleUI.cs