test
test
Merge remote-tracking branch 'origin/romik' into mark
test1
Merge branch 'romik' of https://github.com/MarkInvince/presta_ob into mark
2nd commit
test
Merge remote-tracking branch 'origin/mark' into romik
test2
Merge remote-tracking branch 'origin/mark' into romik
Merge branch 'mark' of https://github.com/MarkInvince/presta_ob into romik
test
Merge branch 'mark' of https://github.com/MarkInvince/presta_ob into romik
test1
test
Merge branches 'mark' and 'romik' of https://github.com/MarkInvince/presta_ob into romik
Merge branches 'mark' and 'romik' of https://github.com/MarkInvince/presta_ob into mark
conflict
conf
Merge branches 'mark' and 'romik' of https://github.com/MarkInvince/presta_ob into mark

Conflicts:
	theme/modules/quotes/quotes.php