MTU-CFAD/Career-Fair-App — pull request #46 by MTVaught (2014-11-14 01:14:16+00:00)
Title: 37 3 Andrew

Fixed merge conflicts