Removed window icon, which caused problems w/ Linux
Merge pull request #397 from BU-CS673/Canfield-MasterClone

Removed window icon, which caused problems w/ Linux
Merge pull request #398 from BU-CS673/production

Last-minute bugfix for Sprint 3.