ostngag/TGPAssignment — pull request #5 by RuiMitchellDaSilva (2014-12-10 17:35:43+00:00)
Title: Fix Commit Error

Error caused files to merge in an unexpected way, resulting in the loss
of files and therefore rendering the program to start.