asdsad
adsad
Merge branch 'master' of https://github.com/fidelsurtida-onehalf/onehalfrecruitment.git
Merge branch 'master' of https://github.com/fidelsurtida-onehalf/onehalfrecruitment.git
Merge branch 'master' of https://github.com/fidelsurtida-onehalf/onehalfrecruitment.git
scripts
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/css/main.css