From 4eb4dfa31f916c5a09f55b37ce259aba34e2543e Mon Sep 17 00:00:00 2001
From: xuanchien <chien.study@gmail.com>
Date: Mon, 24 Nov 2014 21:09:16 +0700
Subject: [PATCH 1/2] NUS Technology team

---
 Teams/NUSTechnology/ABOUT.md  | 20 ++++++++++++++++++++
 Teams/NUSTechnology/team.json | 27 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 Teams/NUSTechnology/ABOUT.md
 create mode 100644 Teams/NUSTechnology/team.json

diff --git a/Teams/NUSTechnology/ABOUT.md b/Teams/NUSTechnology/ABOUT.md
new file mode 100644
index 0000000..d31fc8b
--- /dev/null
+++ b/Teams/NUSTechnology/ABOUT.md
@@ -0,0 +1,20 @@
+This is our page
+================
+
+We are NUS Technology team. We are very excited to join this Hackathon and we are going to do our best in this contest. If you are reading this page and you are on another team, be ready to fight to win the prize :)
+
+
+About your team
+===========================
+
+We are a group of young and passionate Web developers in Ho Chi Minh City, Vietnam. We are all interested in developing web application using cutting-edge technologies such as HTML5, CSS3, Twitter Bootstrap. Our main framework for developing application would be in Ruby on Rails as we have been using it daily for several years.
+
+This contest is a great opportunity for us to test our limits and bring our skills to a new level. We also want to show to the world what we can do to help solve problems we are facing each day. It is all about ideas and how to turn those ideas into reality, and we want to be part of it.
+
+
+About your skills and what you are going to do?
+=======
+
+Our skills: HTML5, CSS3, Javascript, jQuery, BackboneJS, AngularJS, Twitter Boostrap, Ruby on Rails, MySQL, PostgreSQL, MongoDB.
+
+We are thinking of building an application to help the world increase their awareness of issues which our planet is facing today. We could not share more at the moment :).
\ No newline at end of file
diff --git a/Teams/NUSTechnology/team.json b/Teams/NUSTechnology/team.json
new file mode 100644
index 0000000..4b08066
--- /dev/null
+++ b/Teams/NUSTechnology/team.json
@@ -0,0 +1,27 @@
+{
+    "teamName": "NUS Technology",
+    "members": [{
+        "name": "Chien Tran-Xuan",
+        "twitter": "thelazylog",
+        "koding": "xuanchien",
+        "location": "Ho Chi Minh City, Vietnam",
+        "lead": true
+    },
+    {
+        "name": "Nam Tran-Van",
+        "koding": "nusnamtv",
+        "location": "Ho Chi Minh City, Vietnam"
+    },
+    {
+        "name": "Nhan Nguyen-Minh",
+        "twitter": "thelazylog",
+        "koding": "nhannm",
+        "location": "Ho Chi Minh City, Vietnam"
+    },
+    {
+        "name": "Duong Doan-Nguyen",
+        "koding": "duongdn",
+        "location": "Ho Chi Minh City, Vietnam"
+    }
+    ]
+}
\ No newline at end of file

From 33592bf9da7c4b72cfed5a2734b5bdf56859f87a Mon Sep 17 00:00:00 2001
From: xuanchien <chien.study@gmail.com>
Date: Tue, 25 Nov 2014 08:44:13 +0700
Subject: [PATCH 2/2] Update team location

---
 Teams/NUSTechnology/team.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Teams/NUSTechnology/team.json b/Teams/NUSTechnology/team.json
index 4b08066..ebe1e2f 100644
--- a/Teams/NUSTechnology/team.json
+++ b/Teams/NUSTechnology/team.json
@@ -4,24 +4,24 @@
         "name": "Chien Tran-Xuan",
         "twitter": "thelazylog",
         "koding": "xuanchien",
-        "location": "Ho Chi Minh City, Vietnam",
+        "location": "Ho Chi Minh, VN",
         "lead": true
     },
     {
         "name": "Nam Tran-Van",
         "koding": "nusnamtv",
-        "location": "Ho Chi Minh City, Vietnam"
+        "location": "Ho Chi Minh, VN"
     },
     {
         "name": "Nhan Nguyen-Minh",
         "twitter": "thelazylog",
         "koding": "nhannm",
-        "location": "Ho Chi Minh City, Vietnam"
+        "location": "Ho Chi Minh, VN"
     },
     {
         "name": "Duong Doan-Nguyen",
         "koding": "duongdn",
-        "location": "Ho Chi Minh City, Vietnam"
+        "location": "Ho Chi Minh, VN"
     }
     ]
 }
\ No newline at end of file