Slider
Merge branch 'master' of https://github.com/csm725/Applewood

Conflicts:
	assets/css/master.css
	index.html