foo bar
foo bar 2
Merge branch 'master' of https://github.com/julencja/wf-mvp

Conflicts:
	_site/img/css/img1.jpg
Merge branch 'master' of https://github.com/julencja/wf-mvp
Merge branch 'master' of https://github.com/julencja/wf-mvp
Merge branch 'master' of https://github.com/julencja/wf-mvp
Merge branch 'master' of https://github.com/julencja/wf-mvp
Merge branch 'master' of https://github.com/julencja/wf-mvp
Merge branch 'master' of https://github.com/julencja/wf-mvp
Ribbon added
Merge branch 'master' of https://github.com/julencja/wf-mvp

Conflicts:
	img/css/img1.jpg