From: Jim Pryor <profjim@jimpryor.net>
Date: Tue, 26 Oct 2010 15:52:03 +0000 (-0400)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=74c28ae2bdc6692628a47f6bb383d0777256b930;hp=74c28ae2bdc6692628a47f6bb383d0777256b930

Merge branch 'pryor'

Conflicts:
	assignment5.mdwn

Signed-off-by: Jim Pryor <profjim@jimpryor.net>
---