Main: comment
Merge branch 'master' of git@github.com:rabbiters/vert2zest.vc.git

Conflicts:
	application/controllers/welcome.php