From d7994166e226ab58f5012508387a0942e2accb06 Mon Sep 17 00:00:00 2001
From: vilius <vilius@192.168.100.113>
Date: Mon, 31 Mar 2014 16:50:01 +0300
Subject: [PATCH] Merge origin/master

Conflicts:
	.gitignore
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d7cdb59..27a2fd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ ehthumbs.db
 Thumbs.db
 nbproject/
 .git/
+77
\ No newline at end of file