Fixed some Main and User Option bug as well as completing comments for the most important classes
Merge branch 'master' of https://github.com/Lambwatt/SEng426Part4