Simple blog developed with codeigniter framework
Merge origin/master