added slider functionality if need be
Merge branch 'master' of github.com:nyholmniklas/calcium