Add Article and Categories
Merge remote-tracking branch 'origin/master'
Add Categories and Articles in separate files