Fixed a couple things for Montek
Merge branch 'develop' of https://github.com/inderdhir/cs2340-mule-project into develop