Merge pull request #1 from mphoward/master

update jvella local fork
XYZTrajectory

Alpha Version
Get rid of warnings
Got rid of last warning
moved makefile
makefile
Merge pull request #3 from jovella62890/master

XYZ Trajectory