amalvagomes/CPSC215Project1 — pull request #25 by jgdickinson (2011-10-24 18:49:36+00:00)
Title: Commit

Please all the merge fix errors commits...