Fixed merge conflicts
Created an article spec
Merge branch 'master' of github.com:gilest/briefly