PHYS-22 #time 1h #comment Trying to replace my first for loop with a parallel for in the main project. This only partially works right now.  For some reason, not all objects are being drawn. It doesn't quite look like a race condition, because it seems to be firmly outputting the same incomplete list.
PHYS-22 #time 45m #comment Think I figured out why my first attempt at parallelizing a loop has gone so poorly. I'm calling the gl*** functions for drawing inside in the loop, and I have NO clue how that handles parallelization. My guess: it doesn't.
PHYS-22 #time 15m #comment Look at seperating position update later. I think this actually MUST happen because right now there's a ripple effect of force calculations and position updates. This could actually be a huge problem as it currently works.
PHYS-22 #time 25m #comment Moved shape position update out of the same loop as force update. Made it a ShapeList function.
PHYS-22 #time 25m #comment Am now correctly and predictably using multithreading in the ShapeList.update method. Althought it's functioning correctly, it's such a simple loop body that the overhead of parallelizing makes it perform worse. Doesn't matter, had threads.
PHYS-22 #time 15m #comment Sigh, getting corrupted list errors now when trying to run through the large formation simulation. Looks like I didn't properly thread that loop after all.
PHYS-13 #time 45m #comment Tried to make a property to decide whether the program should try to parallelize itself at certain points. Seems to be completely broken at the moment.
PHYS-13 #time 10m #comment Sigh, mispelled property was the problem.
PHYS-14 #time 40m #comment Finally tracked down the orientationMat problem. For some reason I had removed the contents of an if branch that set the value to 0, leading to completely unpredictable values and behavior.
PHYS-16 #time 15m #comment Addressed compiler errors.
PHYS-16 #time 10m #comment Removed a little unnecessary code.
PHYS-16 #time 20m #comment Added some constness.
PHYS-16 #time 50m #comment Trying to get const correctness in some of my code, but running into trouble for now.
PHYS-16 #time 1h 45m #comment Fixed collision detection so that it now actually checks all items. Fixed angular momentum calculations in merge code.  Removed some old timing code. Added some very minor constness.
Merge branch 'prevMomentumFix' into nightly

Conflicts:
	src/ShapeFiles/MyShape.h
PHYS-16 #time 20m #comment Working out where I introduced the list errors into my program.
PHYS-16 #time 25m #comment Got rid of linked corrupted linked list error, but now I need to figure out why objects aren't merging :/
PHYS-16 #time 15m #comment Objects are merging correctly again. Now I need to figure out what true improvements were sacrificed in the effort to make the program stop crashing.
PHYS-16 #time 25m #comment Got some of the updates put back in. Need to refigure out the crazy spinning though.
PHYS-16 #time 1h #comment Read about some compiler issues. Need more up to date information about clang vs g++.