amthompson/CSC492-Assignment3 — pull request #4 by amthompson (2013-11-10 22:38:28+00:00)
Title: Dev to Master merge

Merging changes from dev to master