set up article and category models
created article model, modified article and category models
fixed conflicts
fixed routes error
manually added articles controller from prev commit
Merge pull request #1 from stestyle/articles

set up article and category models