controllers and categories
Merge branch 'master' of https://henryorrin@github.com/Outbreak-team/Outbreak-Tracker.git