stairs
Merge branch 'master' of https://github.com/j10t/lab

Conflicts:
	cs291/05.html