ipagip
Merge branch 'master' of https://github.com/Jveenstra1988/editall

Conflicts:
	css/main.css
	css/style.css
	img/works/com/ah1.jpg
	img/works/com/ah2.jpg
	img/works/com/ah3.jpg
	img/works/com/alib1.jpg
	img/works/com/alib2.jpg
	img/works/com/eneco4.jpg
	img/works/com/hi1.jpg
	img/works/com/hi2.jpg
	img/works/com/hi3.jpg
	img/works/com/inter3.jpg
	img/works/com/inter4.jpg
	img/works/com/olli1.jpg
	img/works/com/olli2.jpg
	img/works/com/olli7.jpg
	img/works/com/olli9.jpg
	img/works/com/popcorn3.jpg
	img/works/com/popcorn4.jpg
	img/works/com/rabo3.jpg
	img/works/com/rabo4.jpg
	img/works/com/rabo5.jpg
	img/works/com/switch3.jpg
	img/works/int/jutter3.jpg
	img/works/int/jutter4.jpg
	img/works/int/jutter5.jpg
	img/works/int/jutter6.jpg
	img/works/int/jutter7.jpg
	img/works/int/jutter9.jpg
	img/works/int/wildschut2.jpg
	img/works/std/jb-bbb2.jpg
	img/works/std/jb-bbb3.jpg
	img/works/std/jb-bbb4.jpg
	img/works/std/modefabriek7.jpg
	img/works/sto/jb-show2.jpg
	img/works/sto/jb-show4.jpg
	img/works/sto/jb-sis2.jpg
	img/works/sto/jb-sis3.jpg
	img/works/sto/jb-store3.jpg
	img/works/sto/jb-store6.jpg
	inc/works-content.php
	inc/works-overzicht.php
Merge branch 'master' of https://github.com/Jveenstra1988/editall