Use marked for News Item Summarys and Comments
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
	views/news/show.jade
Fix Markdown in Summary
Sanitize Markdown
Use marked for News Item Summarys and Comments
Fix Markdown in Summary
Sanitize Markdown
Merge branch 'master' of github.com:evsie001/pullup

Conflicts:
	package.json
	views/news/show.jade
Update Style for Discussions
Merge pull request #186 from evsie001/master

Markdown in Comments and Summary