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

Conflicts:
	css/style.css
Merge branch 'master' of https://github.com/lukhor/ci_intro
commit 19.11.2013