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++.
PHYS-16 #time 45m #comment Still trying to diagnose this damn rotation problem.
Merge branch 'nightly' of https://github.com/swoogles/Physics into nightly
PHYS-23 #time 45m #comment Got program compiling with clang. The compile time speedup right now is minimal (2m10s vs 2m). It wasn't recognizing shared_ptr unless I explicity told it boost::shared_ptr in every spot.  Didn't recognize my omp include either.
PHYS-16 #time 1h #comment Still tinkering and trying to figure out the damn rotation problem.
PHYS-23 #time 20m #comment Removed some unecessary libraries from the compilation of 2 directories. This an an area where I can make a ton of progress.
PHYS-23 #time 15m #comment Added some very simple variables to a few makefiles. Still needs to improve a ton.
PHYS-16 #time 1h #comment Figured out the rotation problem! Again! I made the base class's getMomentOfIntertia function const, and my theory is that this prevented subclasses from overriding it.
Merge branch 'nightly' into PHYS-23

Conflicts:
	src/Physics/Interactions.cpp
	src/Physics/Interactions.h