noxsicarius/4155-Class-Project — pull request #1 by noxsicarius (2014-12-11 18:36:43+00:00)
Title: Merge master

Merging master into test branch so that the test is up to date.