From bac90999c736c69fa61b4391ec1ff3238c76921b Mon Sep 17 00:00:00 2001
From: icarito <none@none>
Date: Mon, 02 Sep 2013 06:10:18 +0000
Subject: failed merge of edit conflict

---
diff --git a/icarito_avatar.png b/icarito_avatar.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/icarito_avatar.png
--
cgit v0.9.1