3
Merge branch 'master' of https://github.com/jed057/ioc-bistux-theme-master

Conflicts:
	static/sass/_jed-theme.scss