Major moving around.
Merge branch 'master' of github.com:tiljeset/algo-eng
Removed unused variables.
Basics for testing now added.