Whitespace change, to test commit hook.
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/master.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/master.css
Merge remote-tracking branch 'origin/master'
Added new pictures to slideshow on main pages.