commit
Merge branch 'master' of https://github.com/lukhor/ci_intro

Conflicts:
	application/views/contact_content.php