Testing fading slideshow
Merge branch 'master' of https://github.com/acbui/acbui.github.io

Conflicts:
	css/main.css
	index.html