added ineq and eq constraints, no time optimization
time optimization added, note we can currently only accomodate one free-fall period because of an obstacle
trajectory generation, with time optimization and general ineq and eq constraints, accommodates 1 infeasible point from an obstacle
Merge branch 'master' of https://github.com/sytang/2DQuadSim

Conflicts:
	1Dversion/1DQuadWithLoadGui/desiredTraj.m
	1Dversion/1DQuadWithLoadGui/desiredTrajOrig.m
	1Dversion/1DQuadWithLoadGui/findTrajTest.m
	1Dversion/1DQuadWithLoadGui/trajGen1DLoad/findQuadEqConstraints.m
	1Dversion/1DQuadWithLoadGui/trajGen1DLoad/findQuadIneqConstraints.m