Fixed some more use cases
Merge branch 'master' of https://github.com/cwallac/SoftDesFinalProject
FIXED AN ERROR IN COMPONENT MOCULE