Merge branch 'working' of github.com:mwlow/warmups into working

Conflicts:
	24-6-14.c
Merge branch 'working'