ignore .swp
changed Story.story_id to article_id
added to comments
basic comments template
ignore #
fixed ignore #
comment stuff
Merge branch 'dev' of https://github.com/tristaneuan/OurWikia into dev