warmup matrix rotate
Merge branch 'working'

Conflicts:
	24-6-14.c