median edited
pushing test
Merge branch 'master' of github.com:mkreider/dc-motor-sw

Conflicts:
	main.c
Merge branch 'master' of github.com:mkreider/dc-motor-sw

Conflicts:
	main.c
Merge branch 'master' of github.com:mkreider/dc-motor-sw
Merge branch 'master' of github.com:mkreider/dc-motor-sw