Merge pull request #138 from BU-CS673/Ethan

Ethan -> Production. Texture & Pillbox changes
Merge pull request #143 from BU-CS673/production

Merge pull request #138 from BU-CS673/Ethan