update the gclient frontend
merge conflict
Merge pull request #2 from jezrielbajan/master1

Master1