Update README

Signed-off-by: Tunilame <tunilame@gmail.com>
s
Update README
Commit
Merge branch 'master' of github.com:TuniLame/charisma-template-codeigniter

Conflicts:
	README.md