From 83d9a3269e768a0d1abb3c36f83b08dd5e93d125 Mon Sep 17 00:00:00 2001
From: knsv <knut@sveido.com>
Date: Mon, 22 Dec 2014 13:58:30 +0100
Subject: [PATCH] Merge branch 'master' of https://github.com/knsv/mermaid

Conflicts:
	README.md
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7c9d7b019..c427f34b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ bower_components/
 *.sublime-project
 *.sublime-workspace
 .DS_Store
+.idea
+coverage
\ No newline at end of file