added slider
Merge branch 'changes' of github.com:kah-odonnell/Scope into changes

Conflicts:
	maps/views.py