gh
.
.
Merge branch 'master' into staging
staging change
Merge branch 'hotfix/HOTFIX1' into staging

Conflicts:
	gihr/header.php
Merge branch 'hotfix/hotfix3'
Merge branch 'master' of github.com:nrjclicks/GIHR into staging
reset auto pull
Merge branch 'staging' into develop

Conflicts:
	gihr/header.php