Fix em dashes being marked up incorrectly
Merge pull request #202 from MaikeruS/quick_fixes-27.11.13

Fix em dashes being marked up incorrectly
Caught extra dd
Merge pull request #203 from vpc/magazine

Caught extra dd
Grammar change
Merge pull request #204 from vpc/magazine

Grammar change
Changed Oglemi's final words from "Not at all" to mhm, because that's what he actually said.
There weren't any spaces when I viewed the articles after the sets, so I put them in. Edit made on fakemons
Merge pull request #206 from smogon/839a897cc02bc58962bebbb2a9f717bf

There weren't any spaces when I viewed the articles after the sets, so I put them in. Edit made on fakemons
Merge pull request #205 from smogon/ee619831b17772d69b2a6df012d53de6

Changed Oglemi's final words from "Not at all" to mhm, because that's what he actually said.
Added missing "him" to conspiracies
Merge pull request #207 from smogon/f9129ac0a9b8735bac23f8fbdda786f3

Added missing "him" to conspiracies
oops one more little sentence removal

bummer wanted it
Merge pull request #209 from smogon/44142db358fa263367d75a17b4ccb6d5

caching
fixes in issue 31
Merge pull request #210 from smogon/6061b78150de3bc346b27e5a99383d77

fixes in issue 31
old-scms-content/smog/issue31/interview.html - nixhext
Merge pull request #211 from smogon/35e853e1aaded5c617366fd6543b2b34

old-scms-content/smog/issue31/interview.html - nixhext
old-scms-content/smog/issue31/interview.html - nixhex has a relative
Merge pull request #212 from smogon/d456d95dbfe95b62164f890353b8fc58

old-scms-content/smog/issue31/interview.html - nixhex has a relative