some changes
testy w branchu
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_includes/themes/the-program/default.html
testy w branchu