Added shit. I don't know. It does stuff now, but it's all wrong.
wut
Wut
Merge remote-tracking branch 'origin/master'

Conflicts:
	iOS/TapDance/Pods/Manifest.lock
	iOS/TapDance/Pods/Pods.xcodeproj/project.pbxproj