ahwdwi
hawdoih
Merge branch 'master' of github.com:simgul-1/modus

Conflicts:
	algoritm/temperature.js
	app/routes.js