Fix Article migrations. Should be good now.
Fix merge conflict.
removed idea/workspace
Merge branch 'master' of github.com:luckyx1/NACLA_2.0
Update seed.rb
user stories
Merge branch 'article_feature'
before approval of team
Changes to features
Cucumber for show/edit and Article ready
Add show and download feature for articles.
updateing
merged