it's making me do this
Merge branch 'master' of https://github.com/joshpfosi/trst_algorithm

Conflicts:
	a.out
	env_data_gen.c
	gen_data
	input.c
	navigate.c
	state_rep.h
	trst
	waypoint_expansion.c