Updated a lot of stuff (sorry can't think of commit message)
Merge branch 'master' of github.com:darshanasivakumar/DisasterManagementCodess