Fixed merge issues with Ryan, Kelly, and Tim's to master
Merge pull request #11 from KShaw29/masterPix

Fixed merge issues with Ryan, Kelly, and Tim's to master