Comminting imaginary changes
Merge remote-tracking branch 'upstream/master' into jp508
Added a lot of core data code.  Going to be focusing on reworking my previous data sets into Managed Objects (which will persist like my .ser file in Android)
Added a new logo for the iSENSE Data Collector application, and core data with my DataSet object now successfully compiles.
Merge remote-tracking branch 'upstream/master' into jp508
App still compiles.  Data Saving not yet functional, but fairly close.
More dataset changes and logo changes
Merge remote-tracking branch 'upstream/master' into jp508
Moved logo stuff around so it would be neater
Merge remote-tracking branch 'upstream/master' into jp508
Merge remote-tracking branch 'upstream/master' into jp508
Worked on fixing iOS bug -- found out what it is finally.
Merge remote-tracking branch 'upstream/master' into jp508
Fixed the crashing car ramp physics bug
trying to configure new bundle
Merge remote-tracking branch 'upstream/master' into jp508
Failed a lot to fix the iOS bug/problem for entities, but succeeded a lot at organizing my changes.
I hate vim
Merge remote-tracking branch 'upstream/master' into jp508

Conflicts:
	Android/Car_Ramp_Physics/src/edu/uml/cs/isense/carphysics/CarRampPhysics.java
cleaned up my repo from when I moved files around the planet