Added scss to demo
Merge branch 'dev' of https://github.com/mojir/solverin into dev

Conflicts:
	Gruntfile.js
	demo/knapsack/knapsack.js
	demo/knapsack/templates.js