These are the newest versions of all of the files from lab computers
Merge pull request #6 from RIT-EVT/user/derekkg/updatesToMaster

These are the newest versions of all of the files from lab computers