funkcny merging, ale este dokoncit testy
meging articles feature finished - including specs and feature tests