created template for incident pages
resolved merge conflict in style.css
Merge branch 'master' of github.com:coffee-n-code/hackathon-team2