add sliding
Merge branch 'master' of github.com:7bits/old-2013

Conflicts:
	js/entities/entities.js