vdvdxv
Merge branch 'master' of https://github.com/mcgoddard/hackathon

Conflicts:
	sibe_application/controllers/welcome.php

commit to pull