Merge branch 'master' of github.com:alu4102/p5AnalizadorDPR

Conflicts:
	Rakefile
	public/tests/chai.js
	public/tests/main.js
	public/tests/mocha.js
	public/tests/tests.js
	views/indexTests.slim
	views/main.coffee
Merge branch 'Adrian'

Conflicts:
	views/main.coffee
Merge branch 'master' of github.com:alu4102/p5AnalizadorDPR into sara
Solucion de errores