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

Conflicts:
	css/style.css