stylesheet updated
stylesheet updated
Merge branch 'master' of https://github.com/ousmaneo/village-N
merge
Conflicts:
	www/sites/all/themes/nvillage/css/style.css
	www/sites/all/themes/nvillage/sass/modules/_main.scss
	www/sites/all/themes/nvillage/sass/modules/_organization.scss