Still working on this…
Xcode can be stupid sometimes…
Fiddling
Merge branch 'master' into UnstableFeedback
Minor changes
Merge branch 'master' into UnstableFeedback
Fiddling.
More fiddling
Merge branch 'master' into UnstableFeedback
A few minor rename changes that got overlooked.
Oops, a few things snuck through.
More simplifying names
Some fiddly changes.
Fix a bug that caused force feedback to crash.
Use more C++ features.
Use more C++ features.
Merge branch 'master' into UnstableFeedback

Conflicts:
	Feedback360/Feedback360.cpp