Merge branch 'groundStation-dev-comp_graph-commands' of git.ece.iastate.edu:danc/MicroCART_17-18 into groundStation-dev-comp_graph-commands

Conflicts:
	quad/Makefile
	quad/src/quad_app/Makefile