Codeigniter files
Merge branch 'master' of https://github.com/Ferrando92/Proyecto