Changed some files
Merge branch 'master' of https://github.com/Turaa/mvc