Вроде доделал
Merge branch 'master' of heroku.com:harp-solver

Conflicts:
	app.js
	routes/solve.js