working on slider
Merge branch 'master' of https://github.com/signal-intrusion/crash-of-84

Conflicts:
	css/styles.css