merge conflict
Merge pull request #6 from jezrielbajan/gcompany-department

merge conflict