Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Thu, 18 Nov 2010 18:10:23 +0000 (13:10 -0500)
committerJim Pryor <profjim@jimpryor.net>
Thu, 18 Nov 2010 18:10:23 +0000 (13:10 -0500)
Conflicts:
hints/assignment_7_hint_1.mdwn


Trivial merge