test
test
Merge branch 'master' of https://github.com/bokultis/genesis

Conflicts:
	themes/horisen_2015/public/css/style.css