Added the article model. Implemented unit testing for article validation.
Fixed merge conflicts with controllers. Everything in them is auto-generated; if it gets in your way feel free to delete it.
Fixed conflict in the show view.