Merge pull request #10 from RITHonorsTechCommittee/grdaneault

Grdaneault merging
Merge remote-tracking branch 'origin' into grdaneault