amthompson/CSC492-Assignment3 — pull request #12 by amthompson (2013-11-17 06:18:42+00:00)
Title: Merge master into dev

Master got ahead on commits. Going to try and merge master into working dev branch.