diff --git a/TODO b/TODO
index b8da2db7..211fdc3f 100644
--- a/TODO
+++ b/TODO
@@ -34,9 +34,6 @@ everything related to tags:
         - tag descriptions
         - tag edit history
 
-everything related to comments:
-    - markdown
-
 refactors:
     - add enum validation in IValidatables (needs refactors of enums and
       possible disposal of EnumHelper in favor of something more subtle)
diff --git a/gruntfile.js b/gruntfile.js
index 4abdbdbf..8d60a8dc 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -97,6 +97,7 @@ module.exports = function(grunt) {
 					{ src: 'node_modules/mousetrap/mousetrap.min.js', dest: 'public_html/lib/mousetrap.min.js' },
 					{ src: 'node_modules/pathjs/path.js', dest: 'public_html/lib/path.js' },
 					{ src: 'node_modules/underscore/underscore-min.js', dest: 'public_html/lib/underscore.min.js' },
+					{ src: 'node_modules/marked/lib/marked.js', dest: 'public_html/lib/marked.js' },
 				]
 			}
 		},
diff --git a/package.json b/package.json
index ef80a2fd..c9e39daf 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
 		"jquery": "~2.1.1",
 		"underscore": "1.7.0",
 		"mousetrap": "0.0.1",
+		"marked": "~0.3.2",
 
 		"requirejs": "*",
 		"ini": "*",
diff --git a/public_html/css/comments.css b/public_html/css/comments.css
index 5a92e5e8..88492b14 100644
--- a/public_html/css/comments.css
+++ b/public_html/css/comments.css
@@ -34,6 +34,9 @@
 .comment .content {
 	margin-top: 0.25em;
 }
+.comment .content p:first-child {
+	margin-top: 0;
+}
 
 .comment .header {
 	line-height: 16pt;
@@ -92,7 +95,7 @@
 	float: left;
 }
 #global-comment-list .comment-add,
-#global-comment-list h1 {
+#global-comment-list .comments>h1 {
 	display: none;
 }
 #global-comment-list .comments {
diff --git a/public_html/css/core.css b/public_html/css/core.css
index 707e82dd..3169cda7 100644
--- a/public_html/css/core.css
+++ b/public_html/css/core.css
@@ -110,3 +110,19 @@ hr {
 .pagination-target .spinner .fa {
 	font-size: 28px;
 }
+
+span.spoiler:before {
+	content: '[';
+	color: #000;
+}
+span.spoiler:after {
+	content: ']';
+	color: #000;
+}
+span.spoiler {
+	background: #eee;
+	color: #eee;
+}
+span.spoiler:hover {
+	color: dimgray;
+}
diff --git a/public_html/index.html b/public_html/index.html
index 1ca3f8e9..1755e82a 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -15,6 +15,7 @@
 	<script type="text/javascript" src="/lib/path.js"></script>
 	<script type="text/javascript" src="/lib/underscore.min.js"></script>
 	<script type="text/javascript" src="/lib/mousetrap.min.js"></script>
+	<script type="text/javascript" src="/lib/marked.js"></script>
 
 	<!-- build:template
 		<link rel="stylesheet" type="text/css" href="app.min.css?<%= timestamp %>"/>
diff --git a/public_html/js/Bootstrap.js b/public_html/js/Bootstrap.js
index ca32f8ab..f6c6720c 100644
--- a/public_html/js/Bootstrap.js
+++ b/public_html/js/Bootstrap.js
@@ -30,4 +30,5 @@ App.DI.registerManual('jQuery', function() { return window.$; });
 App.DI.registerManual('pathJs', function() { return window.pathjs; });
 App.DI.registerManual('_', function() { return window._; });
 App.DI.registerManual('mousetrap', function() { return window.Mousetrap; });
+App.DI.registerManual('marked', function() { return window.marked; });
 App.DI.get('bootstrap');
diff --git a/public_html/js/Util.js b/public_html/js/Util.js
index 73f9207b..e1c934ab 100644
--- a/public_html/js/Util.js
+++ b/public_html/js/Util.js
@@ -1,6 +1,6 @@
 var App = App || {};
 
-App.Util = function(_, jQuery, promise) {
+App.Util = function(_, jQuery, marked, promise) {
 
 	var exitConfirmationEnabled = false;
 
@@ -181,8 +181,41 @@ App.Util = function(_, jQuery, promise) {
 	}
 
 	function formatMarkdown(text) {
-		//todo
-		return text;
+		var renderer = new marked.Renderer();
+
+		var options = {
+			renderer: renderer,
+			breaks: true,
+			sanitize: true,
+			smartypants: true,
+		};
+
+		var preDecorator = function(text) {
+			//prevent ^#... from being treated as headers, due to tag permalinks
+			text = text.replace(/^#/g, '%%%#');
+			return text;
+		};
+
+		var postDecorator = function(text) {
+			//restore headers
+			text = text.replace(/%%%/g, '');
+
+			//search permalinks
+			text = text.replace(/\[search\]((?:[^\[]|\[(?!\/?search\]))+)\[\/search\]/ig, '<a href="#/posts/query=$1"><code>$1</code></a>');
+			//spoilers
+			text = text.replace(/\[spoiler\]((?:[^\[]|\[(?!\/?spoiler\]))+)\[\/spoiler\]/ig, '<span class="spoiler">$1</span>');
+			//strike-through
+			text = text.replace(/(~~|~)([^~]+)\1/g, '<del>$2</del>');
+			//post premalinks
+			text = text.replace(/(^|[\s<>\(\)\[\]])@(\d+)/g, '$1<a href="#/post/$2"><code>@$2</code></a>');
+			//user permalinks
+			text = text.replace(/(^|[\s<>\(\)\[\]])\+([a-zA-Z0-9_-]+)/g, '$1<a href="#/user/$2"><code>+$2</code></a>');
+			//tag permalinks
+			text = text.replace(/(^|[\s<>\(\)\[\]])\#([^\s<>/\\]+)/g, '$1<a href="#/posts/query=$2"><code>#$2</code></a>');
+			return text;
+		};
+
+		return postDecorator(marked(preDecorator(text), options));
 	}
 
 	return {
@@ -201,4 +234,4 @@ App.Util = function(_, jQuery, promise) {
 
 };
 
-App.DI.registerSingleton('util', ['_', 'jQuery', 'promise'], App.Util);
+App.DI.registerSingleton('util', ['_', 'jQuery', 'marked', 'promise'], App.Util);