cleanup
Merge branch 'master' of github.com:ggomes/L0-mpc-demo

Conflicts:
	.idea/copyright/profiles_settings.xml
	.idea/misc.xml
	.idea/workspace.xml