Merge branch 'master' of https://github.com/nixhope/upluschat into dev

Conflicts: README.md
ArslanRafique · Aug 27, 2012 · 9106acc · 9106acc
2 parents e7e85fa + 007fd76
commit 9106acc
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,4 +1,9 @@
-#UdacityPlus Chat
+upluschat
+=========
+
+Collaborative Social Network Realtime Chat
+
+#Readme
 This is a realtime chat server and client designed to run on Google App Engine.
 This is part of the collaborative Udacity Plus project.