Added article model with relationship to category
Added article views and controllers
Fixing merge conflict with sqlite.db
Adding articles controller
Freaking fixed the freaking everything
Merge pull request #1 from HaydenDemerson/articles

Added article model with relationship to category