JAFB/cpsc301Proj — pull request #39 by haria02 (2012-04-07 04:51:45+00:00)
Title: Merge discussion update (from Brennan)

Update discussion page (Not finished)