Changed parameters part a bit
Merge branch 'master' of github.com:petergp/02232

Conflicts:
	Report/tex/requirements/technical_solution.tex