Add parseInt to slide for data-html inputs
Merge branch 'master' of github.com:rogr/scrolling-grid into rugrat

Conflicts:
	app/scripts/main.js
 git commit -m 'Fix fucking merge'
Fix merge