this is the latest commit
Merge branch 'master' of https://github.com/timduffin/codes

Conflicts:
	config/paths.php
	models/code_model.php
	models/header_model.php
	public/css/custom.css
	views/code/js/default.js