Update docs/UsageGuide.md

Resolve conflicts

Author: JoeMatt

docs/UsageGuide.md

@@ -1,12 +1,12 @@
 # Usage
 
-### Storyboard
+## Storyboard
 
 1. In the Identity Inspector, for every pair of source/destination views, give each one the same `HeroID` attribute.
-3. For any other views that you would like to animate, specify animation effects in the `Hero Modifier String` attribute.
-4. Also in the Identity Inspector, enable Hero Transition on your destination view controller.
+2. For any other views that you would like to animate, specify animation effects in the `Hero Modifier String` attribute.
+3. Also in the Identity Inspector, enable Hero Transition on your destination view controller.
 
-### In Code
+## In Code
 
 1. Before doing a transition, set the desired `heroID` and `heroModifiers` to both your source and destination views.
 2. Enable Hero for the destination view controller
@@ -20,12 +20,13 @@
 Hero also supports transitions within a navigation controller or a tab bar controller—just set the 'hero.isEnabled' attribute to true on the UINavigationController/UITabBarController instance.
 
 ## Attributes
+
 There are two important attributes to understand: `heroID` and `heroModifiers`. These are implemented as extensions (using associated objects) for `UIView`. Therefore, after the Hero library is imported, every `UIView` will have these two attributes.
 
 | Attribute Name | Description |
 | --- | --- |
 | `heroID`    | Identifier for the view. Hero will automatically transition between views with the same `heroID` |
-| `her.modifiers` | Specifies the extra animations performed alongside the main transition. |
+| `hero.modifiers` | Specifies the extra animations performed alongside the main transition. |
 
 ## HeroID
 
@@ -40,6 +41,7 @@ Use `hero.modifiers` to specify animations alongside the main transition. Checko
 ```swift
 view.hero.modifiers = [.fade, .translate(x:0, y:-250), .rotate(x:-1.6), .scale(1.5)]
 ```
+
 <!--- TODO: Fix broken image below --->
 <img src="https://github.com/lkzhao/Hero/blob/master/Resources/heroTransition.gif?raw=true" width="300">