Minor bugs
Merge branch 'master' of https://github.com/lincolnharris/csce-315-team-9.git into Shayan