Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	index.html
This commit is contained in:
benweet 2013-03-24 17:59:23 +00:00
commit 3b375ee191

View File

@ -140,4 +140,4 @@
<textarea id="wmd-input"></textarea> <textarea id="wmd-input"></textarea>
<div id="wmd-preview" class="well"></div> <div id="wmd-preview" class="well"></div>
</body> </body>
</html> </html>