From 83fad835e08770a9c3734f97d120292beb58cc5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ellison=20Lea=CC=83o?= <ellisonleao@gmail.com>
Date: Tue, 29 Jul 2014 13:06:09 -0300
Subject: [PATCH] fix conflicts

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 107e14e..641d73f 100644
--- a/README.md
+++ b/README.md
@@ -195,6 +195,7 @@ All with one codebase.
 * [Gideros](http://giderosmobile.com/) - A Cross-Platform framework to create Mobile Apps and games for iOS, Android using Lua programming language.
 * [MOAI](http://getmoai.com/) - Cross-Platform framework designed for pro game developers to create iOS, Android, Windows, Linux, Chrome and OSX games using C++, OpenGL and Lua scripting.
 * [GameSalad](http://gamesalad.com/) - Game Creation Engine for Mac and Windows.
+* [Agen](http://2dengine.com) - Cross-Platform framework for making 2D games with Lua, compatible iOS, Mac and Windows devices.
 * [KiwiJS](http://www.kiwijs.org/) - a fun and friendly Open Source HTML5 Game Engine. Some people call it the WordPress of HTML5 game engines
 * [PandaJS](http://www.pandajs.net/) - Open Source HTML5 Engine.