commit before finalizing motion numbers
Merge branch 'GroupSandbox' of https://github.com/wallisc/Galaxy-Simulator.git
Merged: now includes display time and jump time features
Merge branch 'KanikaSandbox'
Updated EndText11 with a DXUT EditBox fix
Merge branch 'GroupSandbox' of https://github.com/wallisc/Galaxy-Simulator.git
switched to doubles from floats for time values since float wasn't supporting high enough numbers
increased size of particles on GalaxyDraw.hlsl line 59
Merging KanikaSandbox updates to this branch