change git config
prepull commit
prepull commit
Merge branch 'master' of https://github.com/owanturist/e-loue

Conflicts:
	src/_homepage/index.jade
	src/js/custom_select.js
	src/scss/main.scss