Merge branch 'Adrian' of github.com:alu4102/p5AnalizadorDPR into sara

Conflicts:
	Rakefile
	public/tests/chai.js
	public/tests/main.js
	public/tests/mocha.js
	public/tests/tests.js
	views/indexTests.slim
Merge branch 'master' of github.com:alu4102/p5AnalizadorDPR into sara
Solucion de errores
Modificado el estilo
Merge branch 'Adrian' of github.com:alu4102/p5AnalizadorDPR into sara
Añadidas pruebas