test commit 3
Merge branch 'master' of https://github.com/rabbiters/vert2zest.vc

Conflicts:
	application/controllers/welcome.php