added warmup to 10-23
Merge branch 'master' of github.com:gSchool/boulder-g4-assets

Conflicts:
	class-notes/2014-10-23.md