GSP362DeVryNov2014/TheTraveler — pull request #75 by drobbs (2014-12-07 00:42:55+00:00)
Title: PR#74 Fixed Conflicts

Fixed the conflicts from PR#74