Afegint el framework del django 1.6.4 a la carpeta principal
Merge branch 'master' of https://github.com/miscaandrei/projecte_final_daw