blah
blah
Merge branch 'master' of https://github.com/kbselander/cse170happythoughts
blah
blah
working slider
working slider