Nearly working properly
Merge branch 'master' of https://github.com/IMT3521/SecurityPlanning