Merge branch 'next' into dev
Merge branch 'next' into dev
Add a makefile to the units tests, all tests run with "make"
Add TODO to the gitignore
Added Controls class with unit tests
Merge branch 'dev' into objectives