Bluetooth data transfer and serialization are hopefully working.
Fixed merge conflicts.
No change
Merge branch 'iOS' of https://github.com/BehindtheCurtain/AVALANCHE into iOS

Conflicts:
	.DS_Store
	AVALANCHE.xcodeproj/project.pbxproj
	ECSlidingViewController/iPhone.storyboard
Fix merge errors