slider
Merge branch 'master' of https://github.com/Grapheme/Grapheme_reload

Conflicts:
	css/main.css