New version incident.rb from serhii 220702042014
Update incident
Merge branch 'dev' of git://github.com/shbodya/rpit_desk into asniperua
Fix!
Update .gitignore
Update code in the files
Update incident.rb - 'Vasya' was deleted
Update dev branch
Ups...
Fix
Merge branch 'dev' of https://github.com/shbodya/rpit_desk into dev

Conflicts:
	app/models/incident.rb

Merge
Update
change the passwd
Merge branch 'dev' into serhii

Conflicts:
	app/controllers/incidents_controller.rb
	app/models/incident.rb

up