removed todo
Added argument for choosing the routing algorithm.

Merge branch 'master' of ssh://github.com/mktange/TemperatureMonitoringNetwork

Conflicts:
	report/tex/introduction.tex