g-client setup
merge conflict
Merge pull request #2 from jezrielbajan/master1

Master1
gcompany depart and article page
Merge pull request #3 from jezrielbajan/gcompany-department

gcompany depart and article page
Merge pull request #1 from jezrielbajan/master

g-client setup