as
Merge branch 'master' of https://github.com/schavezferrer/TFM

Conflicts:
	NMPC/runningcosts.m