DMT routines added
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/json/routines.json
	src/partials/competition.html