added @ and # to punctuation
Merge pull request #33 from OwenMcGirr/iss#32

added @ and # to punctuation