Incidents added

Moar content!
fixed a file conflict
Merge branch 'justin' of https://github.com/Excelsior-Systems/VIMS into justin