Pre Merge Commit
Merge branch 'RKSwipe'

Conflicts:

CarbonizerSwift.xcodeproj/project.xcworkspace/xcuserdata/ericmarkmartin.
xcuserdatad/UserInterfaceState.xcuserstate
Removed workspace files from index
Merge Upstream

Deleted extraneous subclass(es)
Asset Renaming

Renamed assets to take case sensitive systems into account